* [PATCH v3 1/2] OvmfPkg: move OvmfTpmPei.fdf.inc to Include/Fdf
2023-05-05 11:06 [PATCH v3 0/2] OvmfPkg: move two include files to Include/Fdf Gerd Hoffmann
@ 2023-05-05 11:06 ` Gerd Hoffmann
2023-05-05 11:06 ` [PATCH v3 2/2] OvmfPkg: move OvmfTpmDxe.fdf.inc " Gerd Hoffmann
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2023-05-05 11:06 UTC (permalink / raw)
To: devel; +Cc: Pawel Polawski, Oliver Steffen, Gerd Hoffmann
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
OvmfPkg/AmdSev/AmdSevX64.fdf | 2 +-
OvmfPkg/CloudHv/CloudHvX64.fdf | 2 +-
OvmfPkg/OvmfPkgIa32.fdf | 2 +-
OvmfPkg/OvmfPkgIa32X64.fdf | 2 +-
OvmfPkg/OvmfPkgX64.fdf | 2 +-
OvmfPkg/{ => Include/Fdf}/OvmfTpmPei.fdf.inc | 0
6 files changed, 5 insertions(+), 5 deletions(-)
rename OvmfPkg/{ => Include/Fdf}/OvmfTpmPei.fdf.inc (100%)
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
index 5fb3b5d27632..25e446013cd4 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/Include/Fdf/OvmfTpmPei.fdf.inc
################################################################################
diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf
index 0d13d4066d27..62d048bce181 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/Include/Fdf/OvmfTpmPei.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 15a25f1be5e5..63b9ef5d9674 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/Include/Fdf/OvmfTpmPei.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 138cbd382d4e..36eb28c34f89 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/Include/Fdf/OvmfTpmPei.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 4f24051ae994..d9ecc837295a 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/Include/Fdf/OvmfTpmPei.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc
similarity index 100%
rename from OvmfPkg/OvmfTpmPei.fdf.inc
rename to OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc
--
2.40.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v3 2/2] OvmfPkg: move OvmfTpmDxe.fdf.inc to Include/Fdf
2023-05-05 11:06 [PATCH v3 0/2] OvmfPkg: move two include files to Include/Fdf Gerd Hoffmann
2023-05-05 11:06 ` [PATCH v3 1/2] OvmfPkg: move OvmfTpmPei.fdf.inc " Gerd Hoffmann
@ 2023-05-05 11:06 ` Gerd Hoffmann
2023-05-05 13:29 ` [edk2-devel] [PATCH v3 0/2] OvmfPkg: move two include files " Yao, Jiewen
2023-05-06 7:12 ` Yao, Jiewen
3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2023-05-05 11:06 UTC (permalink / raw)
To: devel; +Cc: Pawel Polawski, Oliver Steffen, Gerd Hoffmann
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
OvmfPkg/AmdSev/AmdSevX64.fdf | 2 +-
OvmfPkg/CloudHv/CloudHvX64.fdf | 2 +-
OvmfPkg/OvmfPkgIa32.fdf | 2 +-
OvmfPkg/OvmfPkgIa32X64.fdf | 2 +-
OvmfPkg/OvmfPkgX64.fdf | 2 +-
OvmfPkg/{ => Include/Fdf}/OvmfTpmDxe.fdf.inc | 0
6 files changed, 5 insertions(+), 5 deletions(-)
rename OvmfPkg/{ => Include/Fdf}/OvmfTpmDxe.fdf.inc (100%)
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
index 25e446013cd4..fec08468d3e0 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -316,7 +316,7 @@ [FV.DXEFV]
#
# TPM support
#
-!include OvmfPkg/OvmfTpmDxe.fdf.inc
+!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
################################################################################
diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf
index 62d048bce181..72de7bcdad66 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.fdf
+++ b/OvmfPkg/CloudHv/CloudHvX64.fdf
@@ -343,7 +343,7 @@ [FV.DXEFV]
#
# TPM support
#
-!include OvmfPkg/OvmfTpmDxe.fdf.inc
+!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 63b9ef5d9674..c9c938439759 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -372,7 +372,7 @@ [FV.DXEFV]
#
# TPM support
#
-!include OvmfPkg/OvmfTpmDxe.fdf.inc
+!include OvmfPkg/Include/Fdf/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 36eb28c34f89..f52219e0c26d 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -379,7 +379,7 @@ [FV.DXEFV]
#
# TPM support
#
-!include OvmfPkg/OvmfTpmDxe.fdf.inc
+!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index d9ecc837295a..00c7f8849fb8 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -413,7 +413,7 @@ [FV.DXEFV]
#
# TPM support
#
-!include OvmfPkg/OvmfTpmDxe.fdf.inc
+!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
similarity index 100%
rename from OvmfPkg/OvmfTpmDxe.fdf.inc
rename to OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
--
2.40.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [edk2-devel] [PATCH v3 0/2] OvmfPkg: move two include files to Include/Fdf
2023-05-05 11:06 [PATCH v3 0/2] OvmfPkg: move two include files to Include/Fdf Gerd Hoffmann
2023-05-05 11:06 ` [PATCH v3 1/2] OvmfPkg: move OvmfTpmPei.fdf.inc " Gerd Hoffmann
2023-05-05 11:06 ` [PATCH v3 2/2] OvmfPkg: move OvmfTpmDxe.fdf.inc " Gerd Hoffmann
@ 2023-05-05 13:29 ` Yao, Jiewen
2023-05-06 7:12 ` Yao, Jiewen
3 siblings, 0 replies; 5+ messages in thread
From: Yao, Jiewen @ 2023-05-05 13:29 UTC (permalink / raw)
To: devel@edk2.groups.io, kraxel@redhat.com; +Cc: Pawel Polawski, Oliver Steffen
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Gerd
> Hoffmann
> Sent: Friday, May 5, 2023 7:06 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 v3 0/2] OvmfPkg: move two include files to
> Include/Fdf
>
> v3:
> - rebase to latest master
> v2:
> - rebase to latest master
>
> Gerd Hoffmann (2):
> OvmfPkg: move OvmfTpmPei.fdf.inc to Include/Fdf
> OvmfPkg: move OvmfTpmDxe.fdf.inc to Include/Fdf
>
> OvmfPkg/AmdSev/AmdSevX64.fdf | 4 ++--
> OvmfPkg/CloudHv/CloudHvX64.fdf | 4 ++--
> OvmfPkg/OvmfPkgIa32.fdf | 4 ++--
> OvmfPkg/OvmfPkgIa32X64.fdf | 4 ++--
> OvmfPkg/OvmfPkgX64.fdf | 4 ++--
> OvmfPkg/{ => Include/Fdf}/OvmfTpmDxe.fdf.inc | 0
> OvmfPkg/{ => Include/Fdf}/OvmfTpmPei.fdf.inc | 0
> 7 files changed, 10 insertions(+), 10 deletions(-)
> rename OvmfPkg/{ => Include/Fdf}/OvmfTpmDxe.fdf.inc (100%)
> rename OvmfPkg/{ => Include/Fdf}/OvmfTpmPei.fdf.inc (100%)
>
> --
> 2.40.1
>
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [edk2-devel] [PATCH v3 0/2] OvmfPkg: move two include files to Include/Fdf
2023-05-05 11:06 [PATCH v3 0/2] OvmfPkg: move two include files to Include/Fdf Gerd Hoffmann
` (2 preceding siblings ...)
2023-05-05 13:29 ` [edk2-devel] [PATCH v3 0/2] OvmfPkg: move two include files " Yao, Jiewen
@ 2023-05-06 7:12 ` Yao, Jiewen
3 siblings, 0 replies; 5+ messages in thread
From: Yao, Jiewen @ 2023-05-06 7:12 UTC (permalink / raw)
To: devel@edk2.groups.io, kraxel@redhat.com; +Cc: Pawel Polawski, Oliver Steffen
Merged https://github.com/tianocore/edk2/pull/4349
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Gerd
> Hoffmann
> Sent: Friday, May 5, 2023 7:06 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 v3 0/2] OvmfPkg: move two include files to
> Include/Fdf
>
> v3:
> - rebase to latest master
> v2:
> - rebase to latest master
>
> Gerd Hoffmann (2):
> OvmfPkg: move OvmfTpmPei.fdf.inc to Include/Fdf
> OvmfPkg: move OvmfTpmDxe.fdf.inc to Include/Fdf
>
> OvmfPkg/AmdSev/AmdSevX64.fdf | 4 ++--
> OvmfPkg/CloudHv/CloudHvX64.fdf | 4 ++--
> OvmfPkg/OvmfPkgIa32.fdf | 4 ++--
> OvmfPkg/OvmfPkgIa32X64.fdf | 4 ++--
> OvmfPkg/OvmfPkgX64.fdf | 4 ++--
> OvmfPkg/{ => Include/Fdf}/OvmfTpmDxe.fdf.inc | 0
> OvmfPkg/{ => Include/Fdf}/OvmfTpmPei.fdf.inc | 0
> 7 files changed, 10 insertions(+), 10 deletions(-)
> rename OvmfPkg/{ => Include/Fdf}/OvmfTpmDxe.fdf.inc (100%)
> rename OvmfPkg/{ => Include/Fdf}/OvmfTpmPei.fdf.inc (100%)
>
> --
> 2.40.1
>
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread