diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 8f7cae787e..e0b04d6734 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -33,7 +33,7 @@ # 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 @@ -200,7 +200,7 @@ 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 @@ -527,12 +527,12 @@ # 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 ################################################################################ # @@ -573,7 +573,7 @@ UefiCpuPkg/CpuMpPei/CpuMpPei.inf OvmfPkg/AmdSev/SecretPei/SecretPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -595,7 +595,7 @@ MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -766,4 +766,4 @@ # # 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 ce277cb239..fcc5722a6b 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -33,7 +33,7 @@ DEFINE SMM_REQUIRE = FALSE DEFINE SOURCE_DEBUG_ENABLE = FALSE -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc # # Network definition @@ -247,7 +247,7 @@ 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 @@ -630,7 +630,7 @@ gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -640,7 +640,7 @@ gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -690,7 +690,7 @@ !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -714,7 +714,7 @@ !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc !endif } @@ -945,4 +945,4 @@ # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc 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/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 994a02d301..649005201f 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -703,7 +703,7 @@ !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 6f774baf90..5a2214a872 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -34,7 +34,7 @@ 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 @@ -252,7 +252,7 @@ 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 @@ -657,7 +657,7 @@ gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -671,7 +671,7 @@ !endif [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -721,7 +721,7 @@ !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -746,7 +746,7 @@ !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 @@ -1014,7 +1014,7 @@ # # 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 c851764dec..bac41d7309 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -33,7 +33,7 @@ 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 @@ -256,7 +256,7 @@ 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 @@ -669,7 +669,7 @@ gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 @@ -684,7 +684,7 @@ gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -734,7 +734,7 @@ !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc [Components.X64] # @@ -760,7 +760,7 @@ !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 @@ -1032,4 +1032,4 @@ # # 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 63c3a47aea..9b6257a691 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -33,7 +33,7 @@ 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 @@ -272,7 +272,7 @@ 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 @@ -693,7 +693,7 @@ gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -707,7 +707,7 @@ !endif [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc ################################################################################ # @@ -780,7 +780,7 @@ NULL|OvmfPkg/Library/MpInitLibDepLib/PeiMpInitLibUpDepLib.inf } -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc # # DXE Phase modules @@ -804,7 +804,7 @@ !if $(SECURE_BOOT_ENABLE) == TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc !endif } @@ -1102,4 +1102,4 @@ # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc