OvmfPkg: move OvmfTpmPei.fdf.inc to Include/Fdf

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
index 5fb3b5d27632ac73966a4b4d05e226fda8fb7e4b..25e446013cd4716a298655a17e95d88dd66576fa 100644 (file)
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -162,7 +162,7 @@ INF  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 INF  OvmfPkg/AmdSev/SecretPei/SecretPei.inf\r
 \r
-!include OvmfPkg/OvmfTpmPei.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf
index 0d13d4066d275121c6bfe17e01d9cc797ee7b107..62d048bce18199384277b5e31b7e1f47207c2375 100644 (file)
--- a/OvmfPkg/CloudHv/CloudHvX64.fdf
+++ b/OvmfPkg/CloudHv/CloudHvX64.fdf
@@ -168,7 +168,7 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif\r
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 \r
-!include OvmfPkg/OvmfTpmPei.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc b/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc
new file mode 100644 (file)
index 0000000..9f8b9bd
--- /dev/null
+++ b/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc
@@ -0,0 +1,15 @@
+##\r
+#    SPDX-License-Identifier: BSD-2-Clause-Patent\r
+##\r
+\r
+!if $(TPM2_ENABLE) == TRUE\r
+INF  OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf\r
+!if $(TPM1_ENABLE) == TRUE\r
+INF  OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf\r
+INF  SecurityPkg/Tcg/TcgPei/TcgPei.inf\r
+!else\r
+INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
+!endif\r
+INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r
+INF  SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf\r
+!endif\r

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 15a25f1be5e5e45e19992c5a2dbf0b2586bc5595..63b9ef5d9674a83ed0b8f361496ba3bafb7f257b 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -172,7 +172,7 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif\r
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 \r
-!include OvmfPkg/OvmfTpmPei.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 138cbd382d4e533bdd1510e8016b6cdfbf8346f9..36eb28c34f89b242c8657f09dec09d0906a9b68f 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -172,7 +172,7 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif\r
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 \r
-!include OvmfPkg/OvmfTpmPei.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 4f24051ae994f0141a012084922f4997991dd1ed..d9ecc837295a388bcac87aea8180d5f23b901434 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -188,7 +188,7 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 INF  FILE_GUID = $(UP_CPU_PEI_GUID) UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 \r
-!include OvmfPkg/OvmfTpmPei.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/OvmfTpmPei.fdf.inc
deleted file mode 100644 (file)
index 9f8b9bd..0000000
--- a/OvmfPkg/OvmfTpmPei.fdf.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-##\r
-#    SPDX-License-Identifier: BSD-2-Clause-Patent\r
-##\r
-\r
-!if $(TPM2_ENABLE) == TRUE\r
-INF  OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf\r
-!if $(TPM1_ENABLE) == TRUE\r
-INF  OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf\r
-INF  SecurityPkg/Tcg/TcgPei/TcgPei.inf\r
-!else\r
-INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
-!endif\r
-INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r
-INF  SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf\r
-!endif\r