[edk2-devel] [PATCH 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support to inc subdir

Gerd Hoffmann posted 3 patches 1 year, 4 months ago
There is a newer version of this series
[edk2-devel] [PATCH 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support to inc subdir
Posted by Gerd Hoffmann 1 year, 4 months ago
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 8f7cae787e97..3c32c27095e0 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -33,7 +33,7 @@ [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
@@ -200,7 +200,7 @@ [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
@@ -527,12 +527,12 @@ [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
 
 ################################################################################
 #
@@ -573,7 +573,7 @@ [Components]
   UefiCpuPkg/CpuMpPei/CpuMpPei.inf
   OvmfPkg/AmdSev/SecretPei/SecretPei.inf
 
-!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc
+!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc
 
   #
   # DXE Phase modules
@@ -595,7 +595,7 @@ [Components]
 
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {
     <LibraryClasses>
-!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc
+!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc
   }
 
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -766,4 +766,4 @@ [Components]
   #
   # TPM support
   #
-!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+!include OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc
diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index ce277cb2398b..79a73a63099f 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -33,7 +33,7 @@ [Defines]
   DEFINE SMM_REQUIRE             = FALSE
   DEFINE SOURCE_DEBUG_ENABLE     = FALSE
 
-!include OvmfPkg/OvmfTpmDefines.dsc.inc
+!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc
 
   #
   # Network definition
@@ -247,7 +247,7 @@ [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
@@ -630,7 +630,7 @@ [PcdsDynamicDefault]
 
   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
 
-!include OvmfPkg/OvmfTpmPcds.dsc.inc
+!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc
 
   # IPv4 and IPv6 PXE Boot support.
   gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
@@ -640,7 +640,7 @@ [PcdsDynamicDefault]
   gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0
 
 [PcdsDynamicHii]
-!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc
+!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc
 
 ################################################################################
 #
@@ -690,7 +690,7 @@ [Components]
 !endif
   UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
-!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc
+!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc
 
   #
   # DXE Phase modules
@@ -714,7 +714,7 @@ [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
   }
 
@@ -945,4 +945,4 @@ [Components]
   #
   # TPM support
   #
-!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+!include OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 994a02d30107..49c77ecf32e3 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -703,7 +703,7 @@ [Components]
     <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 6f774baf90f5..ba41816de4c9 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -34,7 +34,7 @@ [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
@@ -252,7 +252,7 @@ [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
@@ -657,7 +657,7 @@ [PcdsDynamicDefault]
 
   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
 
-!include OvmfPkg/OvmfTpmPcds.dsc.inc
+!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc
 
   # IPv4 and IPv6 PXE Boot support.
   gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
@@ -671,7 +671,7 @@ [PcdsDynamicDefault]
 !endif
 
 [PcdsDynamicHii]
-!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc
+!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc
 
 ################################################################################
 #
@@ -721,7 +721,7 @@ [Components]
 !endif
   UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
-!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc
+!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc
 
   #
   # DXE Phase modules
@@ -746,7 +746,7 @@ [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
@@ -1014,7 +1014,7 @@ [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 c851764dec05..c26d6a353849 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -33,7 +33,7 @@ [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
@@ -256,7 +256,7 @@ [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
@@ -669,7 +669,7 @@ [PcdsDynamicDefault]
 
   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
 
-!include OvmfPkg/OvmfTpmPcds.dsc.inc
+!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc
 
   # Set ConfidentialComputing defaults
   gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0
@@ -684,7 +684,7 @@ [PcdsDynamicDefault.X64]
   gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01
 
 [PcdsDynamicHii]
-!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc
+!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc
 
 ################################################################################
 #
@@ -734,7 +734,7 @@ [Components.IA32]
 !endif
   UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
-!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc
+!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc
 
 [Components.X64]
   #
@@ -760,7 +760,7 @@ [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
@@ -1032,4 +1032,4 @@ [Components.X64]
   #
   # TPM support
   #
-!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+!include OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 63c3a47aea30..dc213ca3c1f9 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -33,7 +33,7 @@ [Defines]
   DEFINE SMM_REQUIRE             = 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
@@ -272,7 +272,7 @@ [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
@@ -693,7 +693,7 @@ [PcdsDynamicDefault]
 
   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
 
-!include OvmfPkg/OvmfTpmPcds.dsc.inc
+!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc
 
   # IPv4 and IPv6 PXE Boot support.
   gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
@@ -707,7 +707,7 @@ [PcdsDynamicDefault]
 !endif
 
 [PcdsDynamicHii]
-!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc
+!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc
 
 ################################################################################
 #
@@ -780,7 +780,7 @@ [Components]
       NULL|OvmfPkg/Library/MpInitLibDepLib/PeiMpInitLibUpDepLib.inf
   }
 
-!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc
+!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc
 
   #
   # DXE Phase modules
@@ -804,7 +804,7 @@ [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
   }
 
@@ -1102,4 +1102,4 @@ [Components]
   #
   # TPM support
   #
-!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+!include OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
index 4658e1d30ed0..bd23888e819f 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -162,7 +162,7 @@ [FV.PEIFV]
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 INF  OvmfPkg/AmdSev/SecretPei/SecretPei.inf
 
-!include OvmfPkg/OvmfTpmPei.fdf.inc
+!include OvmfPkg/inc/OvmfTpmPei.fdf.inc
 
 ################################################################################
 
@@ -316,7 +316,7 @@ [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 a41a5536933d..23296f4bfeae 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.fdf
+++ b/OvmfPkg/CloudHv/CloudHvX64.fdf
@@ -168,7 +168,7 @@ [FV.PEIFV]
 !endif
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
-!include OvmfPkg/OvmfTpmPei.fdf.inc
+!include OvmfPkg/inc/OvmfTpmPei.fdf.inc
 
 ################################################################################
 
@@ -343,7 +343,7 @@ [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 7023ade8cebe..0b0c18674727 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -172,7 +172,7 @@ [FV.PEIFV]
 !endif
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
-!include OvmfPkg/OvmfTpmPei.fdf.inc
+!include OvmfPkg/inc/OvmfTpmPei.fdf.inc
 
 ################################################################################
 
@@ -371,7 +371,7 @@ [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 80de4fa2c0df..4ed3a4f9d72b 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -172,7 +172,7 @@ [FV.PEIFV]
 !endif
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
-!include OvmfPkg/OvmfTpmPei.fdf.inc
+!include OvmfPkg/inc/OvmfTpmPei.fdf.inc
 
 ################################################################################
 
@@ -378,7 +378,7 @@ [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 c0f5a1ef3c30..d0744c463da4 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -188,7 +188,7 @@ [FV.PEIFV]
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 INF  FILE_GUID = $(UP_CPU_PEI_GUID) UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
-!include OvmfPkg/OvmfTpmPei.fdf.inc
+!include OvmfPkg/inc/OvmfTpmPei.fdf.inc
 
 ################################################################################
 
@@ -405,7 +405,7 @@ [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]
-=-=-=-=-=-=-=-=-=-=-=-