public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH v2 0/3] OvmfPkg: move include files to inc subdir
@ 2022-12-09 13:03 Gerd Hoffmann
  2022-12-09 13:03 ` [PATCH v2 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support to subdirs Gerd Hoffmann
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2022-12-09 13:03 UTC (permalink / raw)
  To: devel; +Cc: Pawel Polawski, Oliver Steffen, Gerd Hoffmann

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


^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH v2 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support to subdirs
  2022-12-09 13:03 [PATCH v2 0/3] OvmfPkg: move include files to inc subdir Gerd Hoffmann
@ 2022-12-09 13:03 ` Gerd Hoffmann
  2022-12-09 13:03 ` [PATCH v2 2/3] OvmfPkg: move dsc include snippet for Network support to Include/Dsc Gerd Hoffmann
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2022-12-09 13:03 UTC (permalink / raw)
  To: devel; +Cc: Pawel Polawski, Oliver Steffen, Gerd Hoffmann

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 8f7cae787e97..e0b04d673419 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/Include/Dsc/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/Include/Dsc/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/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 @@ [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
@@ -595,7 +595,7 @@ [Components]
 
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {
     <LibraryClasses>
-!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc
+!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
   }
 
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -766,4 +766,4 @@ [Components]
   #
   # TPM support
   #
-!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index ce277cb2398b..fcc5722a6b66 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -33,7 +33,7 @@ [Defines]
   DEFINE SMM_REQUIRE             = FALSE
   DEFINE SOURCE_DEBUG_ENABLE     = FALSE
 
-!include OvmfPkg/OvmfTpmDefines.dsc.inc
+!include OvmfPkg/Include/Dsc/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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
 
 ################################################################################
 #
@@ -690,7 +690,7 @@ [Components]
 !endif
   UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
-!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc
+!include OvmfPkg/Include/Dsc/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/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
 !endif
   }
 
@@ -945,4 +945,4 @@ [Components]
   #
   # TPM support
   #
-!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 994a02d30107..649005201fcb 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -703,7 +703,7 @@ [Components]
     <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 6f774baf90f5..5a2214a872ed 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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
 
 ################################################################################
 #
@@ -721,7 +721,7 @@ [Components]
 !endif
   UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
-!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc
+!include OvmfPkg/Include/Dsc/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/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
   }
 
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -1014,7 +1014,7 @@ [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 c851764dec05..bac41d7309c7 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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
 
 ################################################################################
 #
@@ -734,7 +734,7 @@ [Components.IA32]
 !endif
   UefiCpuPkg/CpuMpPei/CpuMpPei.inf
 
-!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc
+!include OvmfPkg/Include/Dsc/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/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
   }
 
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -1032,4 +1032,4 @@ [Components.X64]
   #
   # TPM support
   #
-!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 63c3a47aea30..9b6257a6919e 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -33,7 +33,7 @@ [Defines]
   DEFINE SMM_REQUIRE             = 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 @@ [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
@@ -693,7 +693,7 @@ [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
@@ -707,7 +707,7 @@ [PcdsDynamicDefault]
 !endif
 
 [PcdsDynamicHii]
-!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc
+!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
 
 ################################################################################
 #
@@ -780,7 +780,7 @@ [Components]
       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 @@ [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
   }
 
@@ -1102,4 +1102,4 @@ [Components]
   #
   # TPM support
   #
-!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH v2 2/3] OvmfPkg: move dsc include snippet for Network support to Include/Dsc
  2022-12-09 13:03 [PATCH v2 0/3] OvmfPkg: move include files to inc subdir Gerd Hoffmann
  2022-12-09 13:03 ` [PATCH v2 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support to subdirs Gerd Hoffmann
@ 2022-12-09 13:03 ` Gerd Hoffmann
  2022-12-09 13:03 ` [PATCH v2 3/3] mv OvmfPkg: move fdf include snippets to Include/Fdf Gerd Hoffmann
  2022-12-09 14:09 ` [edk2-devel] [PATCH v2 0/3] OvmfPkg: move include files to inc subdir Yao, Jiewen
  3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2022-12-09 13:03 UTC (permalink / raw)
  To: devel; +Cc: Pawel Polawski, Oliver Steffen, Gerd Hoffmann

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 fcc5722a6b66..4fe7cb5f1b68 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -827,7 +827,7 @@ [Components]
   # Network Support
   #
 !include NetworkPkg/NetworkComponents.dsc.inc
-!include OvmfPkg/NetworkComponents.dsc.inc
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc
 
   OvmfPkg/VirtioNetDxe/VirtioNet.inf
 
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 649005201fcb..93d4cf3da255 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -817,7 +817,7 @@ [Components]
   # Network Support
   #
 !include NetworkPkg/NetworkComponents.dsc.inc
-!include OvmfPkg/NetworkComponents.dsc.inc
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc
 
   OvmfPkg/VirtioNetDxe/VirtioNet.inf
 
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 5a2214a872ed..f8250fa63546 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -879,7 +879,7 @@ [Components]
   # Network Support
   #
 !include NetworkPkg/NetworkComponents.dsc.inc
-!include OvmfPkg/NetworkComponents.dsc.inc
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc
 
   OvmfPkg/VirtioNetDxe/VirtioNet.inf
 
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index bac41d7309c7..aca292ce83cf 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -893,7 +893,7 @@ [Components.X64]
   # Network Support
   #
 !include NetworkPkg/NetworkComponents.dsc.inc
-!include OvmfPkg/NetworkComponents.dsc.inc
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc
 
   OvmfPkg/VirtioNetDxe/VirtioNet.inf
 
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 9b6257a6919e..3f6465d8d603 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -961,7 +961,7 @@ [Components]
   # Network Support
   #
 !include NetworkPkg/NetworkComponents.dsc.inc
-!include OvmfPkg/NetworkComponents.dsc.inc
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc
 
   OvmfPkg/VirtioNetDxe/VirtioNet.inf
 
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH v2 3/3] mv OvmfPkg: move fdf include snippets to Include/Fdf
  2022-12-09 13:03 [PATCH v2 0/3] OvmfPkg: move include files to inc subdir Gerd Hoffmann
  2022-12-09 13:03 ` [PATCH v2 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support to subdirs Gerd Hoffmann
  2022-12-09 13:03 ` [PATCH v2 2/3] OvmfPkg: move dsc include snippet for Network support to Include/Dsc Gerd Hoffmann
@ 2022-12-09 13:03 ` Gerd Hoffmann
  2022-12-09 14:09 ` [edk2-devel] [PATCH v2 0/3] OvmfPkg: move include files to inc subdir Yao, Jiewen
  3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2022-12-09 13:03 UTC (permalink / raw)
  To: devel; +Cc: Pawel Polawski, Oliver Steffen, Gerd Hoffmann

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 4658e1d30ed0..5fb3b5d27632 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -11,7 +11,7 @@
 ################################################################################
 
 [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
@@ -24,7 +24,7 @@ [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
@@ -351,7 +351,7 @@ [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 e8227f865f75..153b3cfeba55 100644
--- a/OvmfPkg/Bhyve/BhyveX64.fdf
+++ b/OvmfPkg/Bhyve/BhyveX64.fdf
@@ -24,7 +24,7 @@ [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
@@ -43,7 +43,7 @@ [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)
@@ -368,7 +368,7 @@ [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 a41a5536933d..0d13d4066d27 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.fdf
+++ b/OvmfPkg/CloudHv/CloudHvX64.fdf
@@ -378,7 +378,7 @@ [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 6923eb883113..e79ad3e10217 100644
--- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf
@@ -11,7 +11,7 @@
 ################################################################################
 
 [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
@@ -24,7 +24,7 @@ [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
@@ -43,7 +43,7 @@ [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)
@@ -332,7 +332,7 @@ [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 380ba3a36883..b83fd1e6e4fe 100644
--- a/OvmfPkg/Microvm/MicrovmX64.fdf
+++ b/OvmfPkg/Microvm/MicrovmX64.fdf
@@ -11,7 +11,7 @@
 ################################################################################
 
 [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
@@ -24,7 +24,7 @@ [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
@@ -335,7 +335,7 @@ [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 7023ade8cebe..72bce02caba1 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -11,7 +11,7 @@
 ################################################################################
 
 [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
@@ -24,7 +24,7 @@ [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
@@ -43,7 +43,7 @@ [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)
@@ -410,7 +410,7 @@ [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 80de4fa2c0df..576c985ae008 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -11,7 +11,7 @@
 ################################################################################
 
 [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
@@ -24,7 +24,7 @@ [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
@@ -43,7 +43,7 @@ [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)
@@ -413,7 +413,7 @@ [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 c0f5a1ef3c30..c4aa88243186 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -11,7 +11,7 @@
 ################################################################################
 
 [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
@@ -24,7 +24,7 @@ [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
@@ -43,7 +43,7 @@ [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)
@@ -440,7 +440,7 @@ [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 029b7dadcb25..8be69338c7b6 100644
--- a/OvmfPkg/OvmfXen.fdf
+++ b/OvmfPkg/OvmfXen.fdf
@@ -12,7 +12,7 @@
 ################################################################################
 
 [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
@@ -32,7 +32,7 @@ [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
@@ -86,7 +86,7 @@ [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)
@@ -388,7 +388,7 @@ [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 bf56fc4a6f65..6c3702b716f0 100644
--- a/OvmfPkg/Include/WorkArea.h
+++ b/OvmfPkg/Include/WorkArea.h
@@ -21,7 +21,7 @@
 //   sizeof (CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER)
 // PcdOvmfConfidentialComputingWorkAreaHeader defined in:
 //   OvmfPkg/OvmfPkg.dec
-//   OvmfPkg/OvmfPkgDefines.fdf.inc
+//   OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc
 typedef struct _CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER {
   UINT8    GuestType;
   UINT8    Reserved1[3];
diff --git a/OvmfPkg/Sec/AmdSev.h b/OvmfPkg/Sec/AmdSev.h
index dffd2ceb9656..f75877096e11 100644
--- a/OvmfPkg/Sec/AmdSev.h
+++ b/OvmfPkg/Sec/AmdSev.h
@@ -71,7 +71,7 @@ SevEsIsEnabled (
 /**
  Validate System RAM used for decompressing the PEI and DXE firmware 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 6af38aaf46ee..520b1251321b 100644
--- a/OvmfPkg/Sec/AmdSev.c
+++ b/OvmfPkg/Sec/AmdSev.c
@@ -284,7 +284,7 @@ SevEsIsEnabled (
 /**
  Validate System RAM used for decompressing the PEI and DXE firmware 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


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [edk2-devel] [PATCH v2 0/3] OvmfPkg: move include files to inc subdir
  2022-12-09 13:03 [PATCH v2 0/3] OvmfPkg: move include files to inc subdir Gerd Hoffmann
                   ` (2 preceding siblings ...)
  2022-12-09 13:03 ` [PATCH v2 3/3] mv OvmfPkg: move fdf include snippets to Include/Fdf Gerd Hoffmann
@ 2022-12-09 14:09 ` Yao, Jiewen
  3 siblings, 0 replies; 5+ messages in thread
From: Yao, Jiewen @ 2022-12-09 14:09 UTC (permalink / raw)
  To: devel@edk2.groups.io, kraxel@redhat.com; +Cc: Pawel Polawski, Oliver Steffen

Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>

Merged https://github.com/tianocore/edk2/pull/3743

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Gerd
> Hoffmann
> Sent: Friday, December 9, 2022 9:04 PM
> To: devel@edk2.groups.io
> Cc: Pawel Polawski <ppolawsk@redhat.com>; Oliver Steffen
> <osteffen@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>
> Subject: [edk2-devel] [PATCH v2 0/3] OvmfPkg: move include files to inc
> subdir
> 
> 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
> 
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-12-09 14:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-09 13:03 [PATCH v2 0/3] OvmfPkg: move include files to inc subdir Gerd Hoffmann
2022-12-09 13:03 ` [PATCH v2 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support to subdirs Gerd Hoffmann
2022-12-09 13:03 ` [PATCH v2 2/3] OvmfPkg: move dsc include snippet for Network support to Include/Dsc Gerd Hoffmann
2022-12-09 13:03 ` [PATCH v2 3/3] mv OvmfPkg: move fdf include snippets to Include/Fdf Gerd Hoffmann
2022-12-09 14:09 ` [edk2-devel] [PATCH v2 0/3] OvmfPkg: move include files to inc subdir Yao, Jiewen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox