summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMin M Xu <min.m.xu@intel.com>2024-04-15 15:55:53 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-04-17 03:04:13 +0000
commit93fac4fd7b2dde522b045fb9227766e1ffa5ef72 (patch)
tree34abc83065c6f0d347a941a2a314f7e7987b4fa4
parentc98fbda328f1a83dda05f15a09aab26e18f8298b (diff)
downloadedk2-93fac4fd7b2dde522b045fb9227766e1ffa5ef72.tar.gz
edk2-93fac4fd7b2dde522b045fb9227766e1ffa5ef72.tar.bz2
edk2-93fac4fd7b2dde522b045fb9227766e1ffa5ef72.zip
OvmfPkg: Update TdTcg2Dxe path in OvmfPkgX64 and IntelTdxX64.dsc
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4752 Previously the TdTcg2Dxe and its corresponding HashLibTdx were in SecurityPkg. This patch updates the paths in OvmfPkgX64.dsc and IntelTdxX64.dsc after TdTcg2Dxe and HashLibTdxLib have been moved to OvmfPkg. Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Jiewen Yao <jiewen.yao@intel.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Min Xu <min.m.xu@intel.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
-rw-r--r--OvmfPkg/IntelTdx/IntelTdxX64.dsc4
-rw-r--r--OvmfPkg/IntelTdx/IntelTdxX64.fdf2
-rw-r--r--OvmfPkg/OvmfPkgX64.dsc4
-rw-r--r--OvmfPkg/OvmfPkgX64.fdf2
4 files changed, 6 insertions, 6 deletions
diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
index 7a767324ff..e037253abe 100644
--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
@@ -745,8 +745,8 @@
#
# Cc Measurement Protocol for Td guest
#
- SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf {
+ OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf {
<LibraryClasses>
- HashLib|SecurityPkg/Library/HashLibTdx/HashLibTdx.inf
+ HashLib|OvmfPkg/Library/HashLibTdx/HashLibTdx.inf
NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
}
diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX64.fdf
index f3b5126254..ce5d542048 100644
--- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf
@@ -255,7 +255,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
#
# EFI_CC_MEASUREMENT_PROTOCOL
#
-INF SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
+INF OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
################################################################################
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 56c920168d..15d062f900 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -1038,9 +1038,9 @@
# Cc Measurement Protocol for Td guest
#
!if $(CC_MEASUREMENT_ENABLE) == TRUE
- SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf {
+ OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf {
<LibraryClasses>
- HashLib|SecurityPkg/Library/HashLibTdx/HashLibTdx.inf
+ HashLib|OvmfPkg/Library/HashLibTdx/HashLibTdx.inf
NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
}
!endif
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index eb3fb90cb8..c3b18b638f 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -385,7 +385,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
# EFI_CC_MEASUREMENT_PROTOCOL
#
!if $(CC_MEASUREMENT_ENABLE) == TRUE
-INF SecurityPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
+INF OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf
!endif
#