OvmfPkg: move OvmfTpmDxe.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 25e446013cd4716a298655a17e95d88dd66576fa..fec08468d3e0d04a4db60c9c373ca199c8ae74f8 100644 (file)
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -316,7 +316,7 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 #\r
 # TPM support\r
 #\r
-!include OvmfPkg/OvmfTpmDxe.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf
index 62d048bce18199384277b5e31b7e1f47207c2375..72de7bcdad666cd513a56a5cff8d8b4a044c1f5d 100644 (file)
--- a/OvmfPkg/CloudHv/CloudHvX64.fdf
+++ b/OvmfPkg/CloudHv/CloudHvX64.fdf
@@ -343,7 +343,7 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 #\r
 # TPM support\r
 #\r
-!include OvmfPkg/OvmfTpmDxe.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc b/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
new file mode 100644 (file)
index 0000000..7fc2bf8
--- /dev/null
+++ b/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
@@ -0,0 +1,12 @@
+##\r
+#    SPDX-License-Identifier: BSD-2-Clause-Patent\r
+##\r
+\r
+!if $(TPM2_ENABLE) == TRUE\r
+!if $(TPM1_ENABLE) == TRUE\r
+INF  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf\r
+!endif\r
+INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
+INF  SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf\r
+INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
+!endif\r

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 63b9ef5d9674a83ed0b8f361496ba3bafb7f257b..c9c938439759e5e9d751177f8d8c097d800a7fda 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -372,7 +372,7 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 #\r
 # TPM support\r
 #\r
-!include OvmfPkg/OvmfTpmDxe.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc\r
 \r
 !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE\r
 INF  OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 36eb28c34f89b242c8657f09dec09d0906a9b68f..f52219e0c26d891302f53ca9e1e6cfb8e91e0523 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -379,7 +379,7 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 #\r
 # TPM support\r
 #\r
-!include OvmfPkg/OvmfTpmDxe.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index d9ecc837295a388bcac87aea8180d5f23b901434..00c7f8849fb86481d61a072fa392979e5562be66 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -413,7 +413,7 @@ INF SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
 #\r
 # TPM support\r
 #\r
-!include OvmfPkg/OvmfTpmDxe.fdf.inc\r
+!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc\r
 \r
 ################################################################################\r
 \r

diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/OvmfTpmDxe.fdf.inc
deleted file mode 100644 (file)
index 7fc2bf8..0000000
--- a/OvmfPkg/OvmfTpmDxe.fdf.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-##\r
-#    SPDX-License-Identifier: BSD-2-Clause-Patent\r
-##\r
-\r
-!if $(TPM2_ENABLE) == TRUE\r
-!if $(TPM1_ENABLE) == TRUE\r
-INF  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf\r
-!endif\r
-INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
-INF  SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf\r
-INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
-!endif\r