* [PATCH 0/3] OvmfPkg: move include files to inc subdir
@ 2022-12-02 13:05 Gerd Hoffmann
2022-12-02 13:05 ` [PATCH 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support " Gerd Hoffmann
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Gerd Hoffmann @ 2022-12-02 13:05 UTC (permalink / raw)
To: devel
Cc: Anthony Perard, Jordan Justen, Min Xu, Sebastien Boeuf,
Ard Biesheuvel, Rebecca Cran, Julien Grall, James Bottomley,
Tom Lendacky, Erdem Aktas, Gerd Hoffmann, Jiewen Yao,
Brijesh Singh, Pawel Polawski, Peter Grehan, Oliver Steffen
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support to inc subdir
2022-12-02 13:05 [PATCH 0/3] OvmfPkg: move include files to inc subdir Gerd Hoffmann
@ 2022-12-02 13:05 ` Gerd Hoffmann
2022-12-02 13:05 ` [PATCH 2/3] OvmfPkg: move dsc include snippet for Network " Gerd Hoffmann
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Gerd Hoffmann @ 2022-12-02 13:05 UTC (permalink / raw)
To: devel
Cc: Anthony Perard, Jordan Justen, Min Xu, Sebastien Boeuf,
Ard Biesheuvel, Rebecca Cran, Julien Grall, James Bottomley,
Tom Lendacky, Erdem Aktas, Gerd Hoffmann, Jiewen Yao,
Brijesh Singh, Pawel Polawski, Peter Grehan, Oliver Steffen
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] OvmfPkg: move dsc include snippet for Network support to inc subdir
2022-12-02 13:05 [PATCH 0/3] OvmfPkg: move include files to inc subdir Gerd Hoffmann
2022-12-02 13:05 ` [PATCH 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support " Gerd Hoffmann
@ 2022-12-02 13:05 ` Gerd Hoffmann
2022-12-02 13:05 ` [PATCH 3/3] OvmfPkg: move fdf include snippets to inc subdirectory Gerd Hoffmann
2022-12-09 7:10 ` [edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir Yao, Jiewen
3 siblings, 0 replies; 6+ messages in thread
From: Gerd Hoffmann @ 2022-12-02 13:05 UTC (permalink / raw)
To: devel
Cc: Anthony Perard, Jordan Justen, Min Xu, Sebastien Boeuf,
Ard Biesheuvel, Rebecca Cran, Julien Grall, James Bottomley,
Tom Lendacky, Erdem Aktas, Gerd Hoffmann, Jiewen Yao,
Brijesh Singh, Pawel Polawski, Peter Grehan, Oliver Steffen
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 79a73a63099f..9bb7b8043544 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/inc/NetworkComponents.dsc.inc
OvmfPkg/VirtioNetDxe/VirtioNet.inf
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 49c77ecf32e3..abcefb8824f0 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/inc/NetworkComponents.dsc.inc
OvmfPkg/VirtioNetDxe/VirtioNet.inf
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index ba41816de4c9..f27e9634ec62 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/inc/NetworkComponents.dsc.inc
OvmfPkg/VirtioNetDxe/VirtioNet.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index c26d6a353849..631014cd60a3 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/inc/NetworkComponents.dsc.inc
OvmfPkg/VirtioNetDxe/VirtioNet.inf
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index dc213ca3c1f9..12de436a7910 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/inc/NetworkComponents.dsc.inc
OvmfPkg/VirtioNetDxe/VirtioNet.inf
--
2.38.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] OvmfPkg: move fdf include snippets to inc subdirectory
2022-12-02 13:05 [PATCH 0/3] OvmfPkg: move include files to inc subdir Gerd Hoffmann
2022-12-02 13:05 ` [PATCH 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support " Gerd Hoffmann
2022-12-02 13:05 ` [PATCH 2/3] OvmfPkg: move dsc include snippet for Network " Gerd Hoffmann
@ 2022-12-02 13:05 ` Gerd Hoffmann
2022-12-09 7:10 ` [edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir Yao, Jiewen
3 siblings, 0 replies; 6+ messages in thread
From: Gerd Hoffmann @ 2022-12-02 13:05 UTC (permalink / raw)
To: devel
Cc: Anthony Perard, Jordan Justen, Min Xu, Sebastien Boeuf,
Ard Biesheuvel, Rebecca Cran, Julien Grall, James Bottomley,
Tom Lendacky, Erdem Aktas, Gerd Hoffmann, Jiewen Yao,
Brijesh Singh, Pawel Polawski, Peter Grehan, Oliver Steffen
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
| 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 bd23888e819f..dc110bd5bc7b 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -11,7 +11,7 @@
################################################################################
[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
@@ -24,7 +24,7 @@ [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
@@ -351,7 +351,7 @@ [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 e8227f865f75..d22064967084 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/inc/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/inc/VarStore.fdf.inc
[FD.BHYVE_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
@@ -368,7 +368,7 @@ [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 23296f4bfeae..a45cfa050403 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/inc/FvmainCompactScratchEnd.fdf.inc
################################################################################
diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX64.fdf
index 6923eb883113..f594e88d62e7 100644
--- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf
@@ -11,7 +11,7 @@
################################################################################
[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
@@ -24,7 +24,7 @@ [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
@@ -43,7 +43,7 @@ [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)
@@ -332,7 +332,7 @@ [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 380ba3a36883..a9a0944bb91d 100644
--- a/OvmfPkg/Microvm/MicrovmX64.fdf
+++ b/OvmfPkg/Microvm/MicrovmX64.fdf
@@ -11,7 +11,7 @@
################################################################################
[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
@@ -24,7 +24,7 @@ [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
@@ -335,7 +335,7 @@ [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 0b0c18674727..f4046321a8b5 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -11,7 +11,7 @@
################################################################################
[Defines]
-!include OvmfPkgDefines.fdf.inc
+!include OvmfPkg/inc/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/inc/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/inc/VarStore.fdf.inc
[FD.OVMF_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
@@ -410,7 +410,7 @@ [FV.FVMAIN_COMPACT]
}
}
-!include FvmainCompactScratchEnd.fdf.inc
+!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 4ed3a4f9d72b..e2a2c89f19b7 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -11,7 +11,7 @@
################################################################################
[Defines]
-!include OvmfPkgDefines.fdf.inc
+!include OvmfPkg/inc/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/inc/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/inc/VarStore.fdf.inc
[FD.OVMF_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
@@ -413,7 +413,7 @@ [FV.FVMAIN_COMPACT]
}
}
-!include FvmainCompactScratchEnd.fdf.inc
+!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index d0744c463da4..70f8e8b782da 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -11,7 +11,7 @@
################################################################################
[Defines]
-!include OvmfPkgDefines.fdf.inc
+!include OvmfPkg/inc/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/inc/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/inc/VarStore.fdf.inc
[FD.OVMF_CODE]
BaseAddress = $(CODE_BASE_ADDRESS)
@@ -440,7 +440,7 @@ [FV.FVMAIN_COMPACT]
}
}
-!include FvmainCompactScratchEnd.fdf.inc
+!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf
index 029b7dadcb25..63df9b54d4ad 100644
--- a/OvmfPkg/OvmfXen.fdf
+++ b/OvmfPkg/OvmfXen.fdf
@@ -12,7 +12,7 @@
################################################################################
[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
@@ -32,7 +32,7 @@ [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
@@ -86,7 +86,7 @@ [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)
@@ -388,7 +388,7 @@ [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 bf56fc4a6f65..65a37df0f70a 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/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 dffd2ceb9656..66ac6e67e3ba 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/inc/FvmainCompactScratchEnd.fdf.inc.
**/
VOID
diff --git a/OvmfPkg/Sec/AmdSev.c b/OvmfPkg/Sec/AmdSev.c
index 6af38aaf46ee..51c322b0ad22 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/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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir
2022-12-02 13:05 [PATCH 0/3] OvmfPkg: move include files to inc subdir Gerd Hoffmann
` (2 preceding siblings ...)
2022-12-02 13:05 ` [PATCH 3/3] OvmfPkg: move fdf include snippets to inc subdirectory Gerd Hoffmann
@ 2022-12-09 7:10 ` Yao, Jiewen
2022-12-09 13:04 ` Gerd Hoffmann
3 siblings, 1 reply; 6+ messages in thread
From: Yao, Jiewen @ 2022-12-09 7:10 UTC (permalink / raw)
To: devel@edk2.groups.io, kraxel@redhat.com
Cc: Anthony Perard, Justen, Jordan L, Xu, Min M, Boeuf, Sebastien,
Ard Biesheuvel, Rebecca Cran, Julien Grall, James Bottomley,
Tom Lendacky, Aktas, Erdem, Brijesh Singh, Pawel Polawski,
Peter Grehan, Oliver Steffen
Hi Gerd
I like the idea to put *.dsc and *.fdf to a subdirectory.
I recommend to follow what we did in MinPlatformPkg.
https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel/MinPlatformPkg/Include/Dsc
https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel/MinPlatformPkg/Include/Fdf
*.dsc -> Include/Dsc
*.fdf-> Include/Fdf
Thank you
Yao, Jiewen
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Gerd
> Hoffmann
> Sent: Friday, December 2, 2022 9:06 PM
> To: devel@edk2.groups.io
> Cc: Anthony Perard <anthony.perard@citrix.com>; Justen, Jordan L
> <jordan.l.justen@intel.com>; Xu, Min M <min.m.xu@intel.com>; Boeuf,
> Sebastien <sebastien.boeuf@intel.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Rebecca Cran <rebecca@bsdio.com>; Julien
> Grall <julien@xen.org>; James Bottomley <jejb@linux.ibm.com>; Tom
> Lendacky <thomas.lendacky@amd.com>; Aktas, Erdem
> <erdemaktas@google.com>; Gerd Hoffmann <kraxel@redhat.com>; Yao,
> Jiewen <jiewen.yao@intel.com>; Brijesh Singh <brijesh.singh@amd.com>;
> Pawel Polawski <ppolawsk@redhat.com>; Peter Grehan
> <grehan@freebsd.org>; Oliver Steffen <osteffen@redhat.com>
> Subject: [edk2-devel] [PATCH 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.
>
> 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
>
>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir
2022-12-09 7:10 ` [edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir Yao, Jiewen
@ 2022-12-09 13:04 ` Gerd Hoffmann
0 siblings, 0 replies; 6+ messages in thread
From: Gerd Hoffmann @ 2022-12-09 13:04 UTC (permalink / raw)
To: Yao, Jiewen
Cc: devel@edk2.groups.io, Anthony Perard, Justen, Jordan L, Xu, Min M,
Boeuf, Sebastien, Ard Biesheuvel, Rebecca Cran, Julien Grall,
James Bottomley, Tom Lendacky, Aktas, Erdem, Brijesh Singh,
Pawel Polawski, Peter Grehan, Oliver Steffen
On Fri, Dec 09, 2022 at 07:10:41AM +0000, Yao, Jiewen wrote:
> Hi Gerd
> I like the idea to put *.dsc and *.fdf to a subdirectory.
>
> I recommend to follow what we did in MinPlatformPkg.
> https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel/MinPlatformPkg/Include/Dsc
> https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel/MinPlatformPkg/Include/Fdf
>
> *.dsc -> Include/Dsc
> *.fdf-> Include/Fdf
Sounds good, v2 sent.
thanks,
Gerd
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-12-09 13:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-02 13:05 [PATCH 0/3] OvmfPkg: move include files to inc subdir Gerd Hoffmann
2022-12-02 13:05 ` [PATCH 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support " Gerd Hoffmann
2022-12-02 13:05 ` [PATCH 2/3] OvmfPkg: move dsc include snippet for Network " Gerd Hoffmann
2022-12-02 13:05 ` [PATCH 3/3] OvmfPkg: move fdf include snippets to inc subdirectory Gerd Hoffmann
2022-12-09 7:10 ` [edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir Yao, Jiewen
2022-12-09 13:04 ` Gerd Hoffmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox