We have a number of include files for *.dsc and *.fdf in OvmfPkg/, lets unclutter the directory a bit by moving them all to a subdirectory. Gerd Hoffmann (3): OvmfPkg: move dsc and fdf include snippets for TPM support to inc subdir OvmfPkg: move dsc include snippet for Network support to inc subdir OvmfPkg: move fdf include snippets to inc subdirectory OvmfPkg/{ => inc}/NetworkComponents.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmComponentsDxe.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmComponentsPei.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmDefines.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmLibs.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmPcds.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmPcdsHii.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmSecurityStub.dsc.inc | 0 OvmfPkg/AmdSev/AmdSevX64.dsc | 14 +++++++------- OvmfPkg/CloudHv/CloudHvX64.dsc | 16 ++++++++-------- OvmfPkg/Microvm/MicrovmX64.dsc | 4 ++-- OvmfPkg/OvmfPkgIa32.dsc | 16 ++++++++-------- OvmfPkg/OvmfPkgIa32X64.dsc | 16 ++++++++-------- OvmfPkg/OvmfPkgX64.dsc | 16 ++++++++-------- OvmfPkg/AmdSev/AmdSevX64.fdf | 10 +++++----- OvmfPkg/Bhyve/BhyveX64.fdf | 6 +++--- OvmfPkg/CloudHv/CloudHvX64.fdf | 6 +++--- OvmfPkg/IntelTdx/IntelTdxX64.fdf | 8 ++++---- OvmfPkg/Microvm/MicrovmX64.fdf | 6 +++--- OvmfPkg/OvmfPkgIa32.fdf | 12 ++++++------ OvmfPkg/OvmfPkgIa32X64.fdf | 12 ++++++------ OvmfPkg/OvmfPkgX64.fdf | 12 ++++++------ OvmfPkg/OvmfXen.fdf | 8 ++++---- OvmfPkg/Include/WorkArea.h | 2 +- OvmfPkg/Sec/AmdSev.h | 2 +- OvmfPkg/Sec/AmdSev.c | 2 +- .../{ => inc}/FvmainCompactScratchEnd.fdf.inc | 0 OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc | 0 OvmfPkg/{ => inc}/OvmfTpmDxe.fdf.inc | 0 OvmfPkg/{ => inc}/OvmfTpmPei.fdf.inc | 0 OvmfPkg/{ => inc}/VarStore.fdf.inc | 0 OvmfPkg/{ => inc}/XenElfHeader.fdf.inc | 0 32 files changed, 84 insertions(+), 84 deletions(-) rename OvmfPkg/{ => inc}/NetworkComponents.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmComponentsDxe.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmComponentsPei.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmDefines.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmLibs.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmPcds.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmPcdsHii.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmSecurityStub.dsc.inc (100%) rename OvmfPkg/{ => inc}/FvmainCompactScratchEnd.fdf.inc (100%) rename OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmDxe.fdf.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmPei.fdf.inc (100%) rename OvmfPkg/{ => inc}/VarStore.fdf.inc (100%) rename OvmfPkg/{ => inc}/XenElfHeader.fdf.inc (100%) -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96896): https://edk2.groups.io/g/devel/message/96896 Mute This Topic: https://groups.io/mt/95405111/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=- Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- OvmfPkg/{ => inc}/OvmfTpmComponentsDxe.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmComponentsPei.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmDefines.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmLibs.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmPcds.dsc.inc | 0 OvmfPkg/{ => inc}/OvmfTpmPcdsHii.dsc.inc | 0 OvmfPkg/{ => 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/{ => inc}/OvmfTpmDxe.fdf.inc | 0 OvmfPkg/{ => inc}/OvmfTpmPei.fdf.inc | 0 20 files changed, 46 insertions(+), 46 deletions(-) rename OvmfPkg/{ => inc}/OvmfTpmComponentsDxe.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmComponentsPei.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmDefines.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmLibs.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmPcds.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmPcdsHii.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmSecurityStub.dsc.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmDxe.fdf.inc (100%) rename OvmfPkg/{ => inc}/OvmfTpmPei.fdf.inc (100%) diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/inc/OvmfTpmComponentsDxe.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/OvmfTpmComponentsPei.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.dsc.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.dsc.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/OvmfTpmSecurityStub.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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -XXX,XX +XXX,XX @@ [Defines] # DEFINE SOURCE_DEBUG_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc # # Shell can be useful for debugging but should not be enabled for production @@ -XXX,XX +XXX,XX @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/inc/OvmfTpmLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -XXX,XX +XXX,XX @@ [Components] UefiCpuPkg/CpuMpPei/CpuMpPei.inf OvmfPkg/AmdSev/SecretPei/SecretPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -XXX,XX +XXX,XX @@ [Components] MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { <LibraryClasses> -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -XXX,XX +XXX,XX @@ [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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -XXX,XX +XXX,XX @@ [Defines] DEFINE SMM_REQUIRE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc # # Network definition @@ -XXX,XX +XXX,XX @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/inc/OvmfTpmLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -XXX,XX +XXX,XX @@ [Components] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -XXX,XX +XXX,XX @@ [Components] <LibraryClasses> !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc !endif } @@ -XXX,XX +XXX,XX @@ [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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -XXX,XX +XXX,XX @@ [Components] <LibraryClasses> !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc !endif } diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -XXX,XX +XXX,XX @@ [Defines] DEFINE SOURCE_DEBUG_ENABLE = FALSE DEFINE LOAD_X64_ON_IA32_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc # # Shell can be useful for debugging but should not be enabled for production @@ -XXX,XX +XXX,XX @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/inc/OvmfTpmLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] !endif [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -XXX,XX +XXX,XX @@ [Components] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -XXX,XX +XXX,XX @@ [Components] !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf !endif -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -XXX,XX +XXX,XX @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -XXX,XX +XXX,XX @@ [Defines] DEFINE SMM_REQUIRE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc # # Shell can be useful for debugging but should not be enabled for production @@ -XXX,XX +XXX,XX @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/inc/OvmfTpmLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault.X64] gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -XXX,XX +XXX,XX @@ [Components.IA32] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc [Components.X64] # @@ -XXX,XX +XXX,XX @@ [Components.X64] !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf !endif -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -XXX,XX +XXX,XX @@ [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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -XXX,XX +XXX,XX @@ [Defines] DEFINE SMM_REQUIRE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc # # Shell can be useful for debugging but should not be enabled for production @@ -XXX,XX +XXX,XX @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/inc/OvmfTpmLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] !endif [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -XXX,XX +XXX,XX @@ [Components] NULL|OvmfPkg/Library/MpInitLibDepLib/PeiMpInitLibUpDepLib.inf } -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -XXX,XX +XXX,XX @@ [Components] <LibraryClasses> !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc !endif } @@ -XXX,XX +XXX,XX @@ [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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -XXX,XX +XXX,XX @@ [FV.PEIFV] INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf INF OvmfPkg/AmdSev/SecretPei/SecretPei.inf -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/inc/OvmfTpmPei.fdf.inc ################################################################################ @@ -XXX,XX +XXX,XX @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/inc/OvmfTpmDxe.fdf.inc ################################################################################ diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.fdf +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf @@ -XXX,XX +XXX,XX @@ [FV.PEIFV] !endif INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/inc/OvmfTpmPei.fdf.inc ################################################################################ @@ -XXX,XX +XXX,XX @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/inc/OvmfTpmDxe.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -XXX,XX +XXX,XX @@ [FV.PEIFV] !endif INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/inc/OvmfTpmPei.fdf.inc ################################################################################ @@ -XXX,XX +XXX,XX @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/inc/OvmfTpmDxe.fdf.inc !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -XXX,XX +XXX,XX @@ [FV.PEIFV] !endif INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/inc/OvmfTpmPei.fdf.inc ################################################################################ @@ -XXX,XX +XXX,XX @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/inc/OvmfTpmDxe.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -XXX,XX +XXX,XX @@ [FV.PEIFV] INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf INF FILE_GUID = $(UP_CPU_PEI_GUID) UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/inc/OvmfTpmPei.fdf.inc ################################################################################ @@ -XXX,XX +XXX,XX @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/inc/OvmfTpmDxe.fdf.inc ################################################################################ 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 -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- 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] -=-=-=-=-=-=-=-=-=-=-=- Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- OvmfPkg/{ => 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/{ => inc}/NetworkComponents.dsc.inc (100%) diff --git a/OvmfPkg/NetworkComponents.dsc.inc b/OvmfPkg/inc/NetworkComponents.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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -XXX,XX +XXX,XX @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/inc/NetworkComponents.dsc.inc OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -XXX,XX +XXX,XX @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/inc/NetworkComponents.dsc.inc OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -XXX,XX +XXX,XX @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/inc/NetworkComponents.dsc.inc OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -XXX,XX +XXX,XX @@ [Components.X64] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/inc/NetworkComponents.dsc.inc OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -XXX,XX +XXX,XX @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/inc/NetworkComponents.dsc.inc OvmfPkg/VirtioNetDxe/VirtioNet.inf -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- 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] -=-=-=-=-=-=-=-=-=-=-=- Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- 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/{ => inc}/FvmainCompactScratchEnd.fdf.inc | 0 OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc | 0 OvmfPkg/{ => inc}/VarStore.fdf.inc | 0 OvmfPkg/{ => inc}/XenElfHeader.fdf.inc | 0 16 files changed, 33 insertions(+), 33 deletions(-) rename OvmfPkg/{ => inc}/FvmainCompactScratchEnd.fdf.inc (100%) rename OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc (100%) rename OvmfPkg/{ => inc}/VarStore.fdf.inc (100%) rename OvmfPkg/{ => inc}/XenElfHeader.fdf.inc (100%) diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Bhyve/BhyveX64.fdf +++ b/OvmfPkg/Bhyve/BhyveX64.fdf @@ -XXX,XX +XXX,XX @@ [FD.BHYVE] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FD.BHYVE_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.BHYVE_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.fdf +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -# !include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +# !include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.MICROVM] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc # # This will allow the flash device image to be recognize as an ELF, with first @@ -XXX,XX +XXX,XX @@ [FD.OVMF] 0x00000000|0x00040000 !endif -!include XenElfHeader.fdf.inc +!include OvmfPkg/inc/XenElfHeader.fdf.inc !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048) 0x0000e000|0x00001000 @@ -XXX,XX +XXX,XX @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/Include/WorkArea.h b/OvmfPkg/Include/WorkArea.h index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Include/WorkArea.h +++ b/OvmfPkg/Include/WorkArea.h @@ -XXX,XX +XXX,XX @@ // 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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Sec/AmdSev.h +++ b/OvmfPkg/Sec/AmdSev.h @@ -XXX,XX +XXX,XX @@ SevEsIsEnabled ( /** Validate System RAM used for decompressing the PEI and DXE firmware volumes when SEV-SNP is active. The PCDs SecValidatedStart and SecValidatedEnd are - set in OvmfPkg/FvmainCompactScratchEnd.fdf.inc. + set in OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc. **/ VOID diff --git a/OvmfPkg/Sec/AmdSev.c b/OvmfPkg/Sec/AmdSev.c index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Sec/AmdSev.c +++ b/OvmfPkg/Sec/AmdSev.c @@ -XXX,XX +XXX,XX @@ SevEsIsEnabled ( /** Validate System RAM used for decompressing the PEI and DXE firmware volumes when SEV-SNP is active. The PCDs SecValidatedStart and SecValidatedEnd are - set in OvmfPkg/FvmainCompactScratchEnd.fdf.inc. + set in OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc. **/ VOID diff --git a/OvmfPkg/FvmainCompactScratchEnd.fdf.inc b/OvmfPkg/inc/FvmainCompactScratchEnd.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.fdf.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 -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- 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] -=-=-=-=-=-=-=-=-=-=-=- We have a number of include files for *.dsc and *.fdf in OvmfPkg/, lets unclutter the directory a bit by moving them all to a subdirectory. v2: use Include/{Dsc,Fdf} instead of inc Gerd Hoffmann (3): OvmfPkg: move dsc and fdf include snippets for TPM support to subdirs OvmfPkg: move dsc include snippet for Network support to Include/Dsc mv OvmfPkg: move fdf include snippets to Include/Fdf .../{ => Include/Dsc}/NetworkComponents.dsc.inc | 0 .../Dsc}/OvmfTpmComponentsDxe.dsc.inc | 0 .../Dsc}/OvmfTpmComponentsPei.dsc.inc | 0 OvmfPkg/{ => Include/Dsc}/OvmfTpmDefines.dsc.inc | 0 OvmfPkg/{ => Include/Dsc}/OvmfTpmLibs.dsc.inc | 0 OvmfPkg/{ => Include/Dsc}/OvmfTpmPcds.dsc.inc | 0 OvmfPkg/{ => Include/Dsc}/OvmfTpmPcdsHii.dsc.inc | 0 .../Dsc}/OvmfTpmSecurityStub.dsc.inc | 0 OvmfPkg/AmdSev/AmdSevX64.dsc | 14 +++++++------- OvmfPkg/CloudHv/CloudHvX64.dsc | 16 ++++++++-------- OvmfPkg/Microvm/MicrovmX64.dsc | 4 ++-- OvmfPkg/OvmfPkgIa32.dsc | 16 ++++++++-------- OvmfPkg/OvmfPkgIa32X64.dsc | 16 ++++++++-------- OvmfPkg/OvmfPkgX64.dsc | 16 ++++++++-------- 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 +- .../Fdf}/FvmainCompactScratchEnd.fdf.inc | 0 OvmfPkg/{ => Include/Fdf}/OvmfPkgDefines.fdf.inc | 0 OvmfPkg/{ => Include/Fdf}/VarStore.fdf.inc | 0 OvmfPkg/{ => Include/Fdf}/XenElfHeader.fdf.inc | 0 30 files changed, 74 insertions(+), 74 deletions(-) rename OvmfPkg/{ => Include/Dsc}/NetworkComponents.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmComponentsDxe.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmComponentsPei.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmDefines.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmLibs.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmPcds.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmPcdsHii.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmSecurityStub.dsc.inc (100%) rename OvmfPkg/{ => Include/Fdf}/FvmainCompactScratchEnd.fdf.inc (100%) rename OvmfPkg/{ => Include/Fdf}/OvmfPkgDefines.fdf.inc (100%) rename OvmfPkg/{ => Include/Fdf}/VarStore.fdf.inc (100%) rename OvmfPkg/{ => Include/Fdf}/XenElfHeader.fdf.inc (100%) -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97179): https://edk2.groups.io/g/devel/message/97179 Mute This Topic: https://groups.io/mt/95559456/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=- Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- .../{ => Include/Dsc}/OvmfTpmComponentsDxe.dsc.inc | 0 .../{ => Include/Dsc}/OvmfTpmComponentsPei.dsc.inc | 0 OvmfPkg/{ => Include/Dsc}/OvmfTpmDefines.dsc.inc | 0 OvmfPkg/{ => Include/Dsc}/OvmfTpmLibs.dsc.inc | 0 OvmfPkg/{ => Include/Dsc}/OvmfTpmPcds.dsc.inc | 0 OvmfPkg/{ => Include/Dsc}/OvmfTpmPcdsHii.dsc.inc | 0 .../{ => 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/{ => Include/Dsc}/OvmfTpmComponentsDxe.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmComponentsPei.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmDefines.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmLibs.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmPcds.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmPcdsHii.dsc.inc (100%) rename OvmfPkg/{ => Include/Dsc}/OvmfTpmSecurityStub.dsc.inc (100%) diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.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/OvmfTpmComponentsPei.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/OvmfTpmDefines.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/OvmfTpmPcdsHii.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/OvmfTpmSecurityStub.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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -XXX,XX +XXX,XX @@ [Defines] # DEFINE SOURCE_DEBUG_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc # # Shell can be useful for debugging but should not be enabled for production @@ -XXX,XX +XXX,XX @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -XXX,XX +XXX,XX @@ [Components] UefiCpuPkg/CpuMpPei/CpuMpPei.inf OvmfPkg/AmdSev/SecretPei/SecretPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -XXX,XX +XXX,XX @@ [Components] MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { <LibraryClasses> -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -XXX,XX +XXX,XX @@ [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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -XXX,XX +XXX,XX @@ [Defines] DEFINE SMM_REQUIRE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc # # Network definition @@ -XXX,XX +XXX,XX @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -XXX,XX +XXX,XX @@ [Components] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -XXX,XX +XXX,XX @@ [Components] <LibraryClasses> !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc !endif } @@ -XXX,XX +XXX,XX @@ [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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -XXX,XX +XXX,XX @@ [Components] <LibraryClasses> !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc !endif } diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -XXX,XX +XXX,XX @@ [Defines] DEFINE SOURCE_DEBUG_ENABLE = FALSE DEFINE LOAD_X64_ON_IA32_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc # # Shell can be useful for debugging but should not be enabled for production @@ -XXX,XX +XXX,XX @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] !endif [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -XXX,XX +XXX,XX @@ [Components] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -XXX,XX +XXX,XX @@ [Components] !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf !endif -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -XXX,XX +XXX,XX @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -XXX,XX +XXX,XX @@ [Defines] DEFINE SMM_REQUIRE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc # # Shell can be useful for debugging but should not be enabled for production @@ -XXX,XX +XXX,XX @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault.X64] gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -XXX,XX +XXX,XX @@ [Components.IA32] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc [Components.X64] # @@ -XXX,XX +XXX,XX @@ [Components.X64] !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf !endif -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -XXX,XX +XXX,XX @@ [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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -XXX,XX +XXX,XX @@ [Defines] DEFINE SMM_REQUIRE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc # # Shell can be useful for debugging but should not be enabled for production @@ -XXX,XX +XXX,XX @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -XXX,XX +XXX,XX @@ [PcdsDynamicDefault] !endif [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -XXX,XX +XXX,XX @@ [Components] NULL|OvmfPkg/Library/MpInitLibDepLib/PeiMpInitLibUpDepLib.inf } -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -XXX,XX +XXX,XX @@ [Components] <LibraryClasses> !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc !endif } @@ -XXX,XX +XXX,XX @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- 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] -=-=-=-=-=-=-=-=-=-=-=- Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- OvmfPkg/{ => 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/{ => Include/Dsc}/NetworkComponents.dsc.inc (100%) diff --git a/OvmfPkg/NetworkComponents.dsc.inc b/OvmfPkg/Include/Dsc/NetworkComponents.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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -XXX,XX +XXX,XX @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -XXX,XX +XXX,XX @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -XXX,XX +XXX,XX @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -XXX,XX +XXX,XX @@ [Components.X64] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -XXX,XX +XXX,XX @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc OvmfPkg/VirtioNetDxe/VirtioNet.inf -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- 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] -=-=-=-=-=-=-=-=-=-=-=- Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- 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/{ => Include/Fdf}/FvmainCompactScratchEnd.fdf.inc | 0 OvmfPkg/{ => Include/Fdf}/OvmfPkgDefines.fdf.inc | 0 OvmfPkg/{ => Include/Fdf}/VarStore.fdf.inc | 0 OvmfPkg/{ => Include/Fdf}/XenElfHeader.fdf.inc | 0 16 files changed, 33 insertions(+), 33 deletions(-) rename OvmfPkg/{ => Include/Fdf}/FvmainCompactScratchEnd.fdf.inc (100%) rename OvmfPkg/{ => Include/Fdf}/OvmfPkgDefines.fdf.inc (100%) rename OvmfPkg/{ => Include/Fdf}/VarStore.fdf.inc (100%) rename OvmfPkg/{ => Include/Fdf}/XenElfHeader.fdf.inc (100%) diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Bhyve/BhyveX64.fdf +++ b/OvmfPkg/Bhyve/BhyveX64.fdf @@ -XXX,XX +XXX,XX @@ [FD.BHYVE] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FD.BHYVE_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc [FD.BHYVE_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.fdf +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -# !include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +# !include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.MICROVM] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -XXX,XX +XXX,XX @@ [FD.OVMF] BlockSize = $(BLOCK_SIZE) NumBlocks = $(FW_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc $(VARS_SIZE)|$(FVMAIN_SIZE) FV = FVMAIN_COMPACT @@ -XXX,XX +XXX,XX @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -XXX,XX +XXX,XX @@ ################################################################################ [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc # # This will allow the flash device image to be recognize as an ELF, with first @@ -XXX,XX +XXX,XX @@ [FD.OVMF] 0x00000000|0x00040000 !endif -!include XenElfHeader.fdf.inc +!include OvmfPkg/Include/Fdf/XenElfHeader.fdf.inc !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048) 0x0000e000|0x00001000 @@ -XXX,XX +XXX,XX @@ [FD.OVMF_VARS] BlockSize = $(BLOCK_SIZE) NumBlocks = $(VARS_BLOCKS) -!include VarStore.fdf.inc +!include OvmfPkg/Include/Fdf/VarStore.fdf.inc [FD.OVMF_CODE] BaseAddress = $(CODE_BASE_ADDRESS) @@ -XXX,XX +XXX,XX @@ [FV.FVMAIN_COMPACT] } } -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/Include/WorkArea.h b/OvmfPkg/Include/WorkArea.h index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Include/WorkArea.h +++ b/OvmfPkg/Include/WorkArea.h @@ -XXX,XX +XXX,XX @@ // 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 XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Sec/AmdSev.h +++ b/OvmfPkg/Sec/AmdSev.h @@ -XXX,XX +XXX,XX @@ SevEsIsEnabled ( /** Validate System RAM used for decompressing the PEI and DXE firmware volumes 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. **/ VOID diff --git a/OvmfPkg/Sec/AmdSev.c b/OvmfPkg/Sec/AmdSev.c index XXXXXXX..XXXXXXX 100644 --- a/OvmfPkg/Sec/AmdSev.c +++ b/OvmfPkg/Sec/AmdSev.c @@ -XXX,XX +XXX,XX @@ SevEsIsEnabled ( /** Validate System RAM used for decompressing the PEI and DXE firmware volumes 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. **/ 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/OvmfPkgDefines.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/XenElfHeader.fdf.inc similarity index 100% rename from OvmfPkg/XenElfHeader.fdf.inc rename to OvmfPkg/Include/Fdf/XenElfHeader.fdf.inc -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- 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] -=-=-=-=-=-=-=-=-=-=-=-