|
 |
75d8e7 |
From 5787adaccb16e4af7df661d6c7eb3197c7f14218 Mon Sep 17 00:00:00 2001
|
|
|
75d8e7 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
75d8e7 |
Date: Wed, 15 Dec 2021 12:39:20 +0100
|
|
|
75d8e7 |
Subject: [PATCH 5/6] OvmfPkg: rework TPM configuration
|
|
|
75d8e7 |
|
|
|
75d8e7 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
75d8e7 |
RH-MergeRequest: 9: backport tpm build updates, disable tpm 1.2 support
|
|
|
75d8e7 |
RH-Commit: [5/6] 81ed86c6993e8cca4fabf5f471e198134b907562 (kraxel/centos-edk2)
|
|
|
75d8e7 |
RH-Bugzilla: 1935497
|
|
|
75d8e7 |
RH-Acked-by: Oliver Steffen <None>
|
|
|
75d8e7 |
|
|
|
75d8e7 |
Rename TPM_ENABLE to TPM2_ENABLE so naming is in line with the
|
|
|
75d8e7 |
ArmVirtPkg config option name.
|
|
|
75d8e7 |
|
|
|
75d8e7 |
Add separate TPM1_ENABLE option for TPM 1.2 support.
|
|
|
75d8e7 |
|
|
|
75d8e7 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
75d8e7 |
Tested-by: Stefan Berger <stefanb@linux.ibm.com>
|
|
|
75d8e7 |
(cherry picked from commit 4de8d61bcec02a13ceed84f92b0cf3ea58adf9c5)
|
|
|
75d8e7 |
---
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmComponentsDxe.dsc.inc | 4 +++-
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmComponentsPei.dsc.inc | 6 +++++-
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmDefines.dsc.inc | 5 ++++-
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmDxe.fdf.inc | 4 +++-
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmLibs.dsc.inc | 4 +++-
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmLibsDxe.dsc.inc | 4 +++-
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmLibsPeim.dsc.inc | 4 +++-
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmPcds.dsc.inc | 2 +-
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmPcdsHii.dsc.inc | 2 +-
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmPei.fdf.inc | 6 +++++-
|
|
|
75d8e7 |
OvmfPkg/OvmfTpmSecurityStub.dsc.inc | 4 +++-
|
|
|
75d8e7 |
OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 6 +++---
|
|
|
75d8e7 |
OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 6 +++---
|
|
|
75d8e7 |
OvmfPkg/PlatformCI/ReadMe.md | 2 +-
|
|
|
75d8e7 |
14 files changed, 41 insertions(+), 18 deletions(-)
|
|
|
75d8e7 |
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
|
|
|
75d8e7 |
index e025d85a58..75ae09571e 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
|
|
|
75d8e7 |
@@ -2,7 +2,7 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
-!if $(TPM_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM2_ENABLE) == TRUE
|
|
|
75d8e7 |
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {
|
|
|
75d8e7 |
<LibraryClasses>
|
|
|
75d8e7 |
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
|
|
|
75d8e7 |
@@ -15,10 +15,12 @@
|
|
|
75d8e7 |
NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
|
|
|
75d8e7 |
}
|
|
|
75d8e7 |
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
|
|
|
75d8e7 |
+!if $(TPM1_ENABLE) == TRUE
|
|
|
75d8e7 |
SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {
|
|
|
75d8e7 |
<LibraryClasses>
|
|
|
75d8e7 |
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
|
|
|
75d8e7 |
}
|
|
|
75d8e7 |
+!endif
|
|
|
75d8e7 |
SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf {
|
|
|
75d8e7 |
<LibraryClasses>
|
|
|
75d8e7 |
TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
|
|
|
75d8e7 |
index 87d491da50..fa486eed82 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
|
|
|
75d8e7 |
@@ -2,10 +2,14 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
-!if $(TPM_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM2_ENABLE) == TRUE
|
|
|
75d8e7 |
OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf
|
|
|
75d8e7 |
+!if $(TPM1_ENABLE) == TRUE
|
|
|
75d8e7 |
OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf
|
|
|
75d8e7 |
SecurityPkg/Tcg/TcgPei/TcgPei.inf
|
|
|
75d8e7 |
+!else
|
|
|
75d8e7 |
+ OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
|
|
|
75d8e7 |
+!endif
|
|
|
75d8e7 |
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {
|
|
|
75d8e7 |
<LibraryClasses>
|
|
|
75d8e7 |
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmDefines.dsc.inc b/OvmfPkg/OvmfTpmDefines.dsc.inc
|
|
|
75d8e7 |
index 5df4a331fb..a65564d8d9 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmDefines.dsc.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmDefines.dsc.inc
|
|
|
75d8e7 |
@@ -2,4 +2,7 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
- DEFINE TPM_ENABLE = FALSE
|
|
|
75d8e7 |
+ DEFINE TPM2_ENABLE = FALSE
|
|
|
75d8e7 |
+
|
|
|
75d8e7 |
+ # has no effect unless TPM2_ENABLE == TRUE
|
|
|
75d8e7 |
+ DEFINE TPM1_ENABLE = TRUE
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/OvmfTpmDxe.fdf.inc
|
|
|
75d8e7 |
index 32eef24638..7fc2bf8590 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmDxe.fdf.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmDxe.fdf.inc
|
|
|
75d8e7 |
@@ -2,8 +2,10 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
-!if $(TPM_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM2_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM1_ENABLE) == TRUE
|
|
|
75d8e7 |
INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
|
|
|
75d8e7 |
+!endif
|
|
|
75d8e7 |
INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
|
|
|
75d8e7 |
INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
|
|
|
75d8e7 |
INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmLibs.dsc.inc b/OvmfPkg/OvmfTpmLibs.dsc.inc
|
|
|
75d8e7 |
index 50100f2c03..418747b134 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmLibs.dsc.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmLibs.dsc.inc
|
|
|
75d8e7 |
@@ -2,8 +2,10 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
-!if $(TPM_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM2_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM1_ENABLE) == TRUE
|
|
|
75d8e7 |
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
|
|
|
75d8e7 |
+!endif
|
|
|
75d8e7 |
Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
|
|
|
75d8e7 |
Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf
|
|
|
75d8e7 |
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmLibsDxe.dsc.inc b/OvmfPkg/OvmfTpmLibsDxe.dsc.inc
|
|
|
75d8e7 |
index 67d5027aba..1d66cdac77 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmLibsDxe.dsc.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmLibsDxe.dsc.inc
|
|
|
75d8e7 |
@@ -2,7 +2,9 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
-!if $(TPM_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM2_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM1_ENABLE) == TRUE
|
|
|
75d8e7 |
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
|
|
|
75d8e7 |
+!endif
|
|
|
75d8e7 |
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
|
|
|
75d8e7 |
!endif
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmLibsPeim.dsc.inc b/OvmfPkg/OvmfTpmLibsPeim.dsc.inc
|
|
|
75d8e7 |
index 4e84e3dcaa..03caccd7c6 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmLibsPeim.dsc.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmLibsPeim.dsc.inc
|
|
|
75d8e7 |
@@ -2,8 +2,10 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
-!if $(TPM_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM2_ENABLE) == TRUE
|
|
|
75d8e7 |
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
|
|
|
75d8e7 |
+!if $(TPM1_ENABLE) == TRUE
|
|
|
75d8e7 |
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
|
|
|
75d8e7 |
+!endif
|
|
|
75d8e7 |
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
|
|
|
75d8e7 |
!endif
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmPcds.dsc.inc b/OvmfPkg/OvmfTpmPcds.dsc.inc
|
|
|
75d8e7 |
index 0e7f83c04b..0d55d62737 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmPcds.dsc.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmPcds.dsc.inc
|
|
|
75d8e7 |
@@ -2,6 +2,6 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
-!if $(TPM_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM2_ENABLE) == TRUE
|
|
|
75d8e7 |
gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
|
|
|
75d8e7 |
!endif
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc
|
|
|
75d8e7 |
index 2e02a5b4cb..e842253235 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc
|
|
|
75d8e7 |
@@ -2,7 +2,7 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
-!if $(TPM_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM2_ENABLE) == TRUE
|
|
|
75d8e7 |
gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS
|
|
|
75d8e7 |
gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS
|
|
|
75d8e7 |
!endif
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/OvmfTpmPei.fdf.inc
|
|
|
75d8e7 |
index 709a608cc3..9f8b9bdd5b 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmPei.fdf.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmPei.fdf.inc
|
|
|
75d8e7 |
@@ -2,10 +2,14 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
-!if $(TPM_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM2_ENABLE) == TRUE
|
|
|
75d8e7 |
INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf
|
|
|
75d8e7 |
+!if $(TPM1_ENABLE) == TRUE
|
|
|
75d8e7 |
INF OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf
|
|
|
75d8e7 |
INF SecurityPkg/Tcg/TcgPei/TcgPei.inf
|
|
|
75d8e7 |
+!else
|
|
|
75d8e7 |
+INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
|
|
|
75d8e7 |
+!endif
|
|
|
75d8e7 |
INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
|
|
|
75d8e7 |
INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
|
|
|
75d8e7 |
!endif
|
|
|
75d8e7 |
diff --git a/OvmfPkg/OvmfTpmSecurityStub.dsc.inc b/OvmfPkg/OvmfTpmSecurityStub.dsc.inc
|
|
|
75d8e7 |
index 4bd4066843..e9ab2fca7b 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/OvmfTpmSecurityStub.dsc.inc
|
|
|
75d8e7 |
+++ b/OvmfPkg/OvmfTpmSecurityStub.dsc.inc
|
|
|
75d8e7 |
@@ -2,7 +2,9 @@
|
|
|
75d8e7 |
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
75d8e7 |
##
|
|
|
75d8e7 |
|
|
|
75d8e7 |
-!if $(TPM_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM2_ENABLE) == TRUE
|
|
|
75d8e7 |
+!if $(TPM1_ENABLE) == TRUE
|
|
|
75d8e7 |
NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
|
|
|
75d8e7 |
+!endif
|
|
|
75d8e7 |
NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
|
|
|
75d8e7 |
!endif
|
|
|
75d8e7 |
diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
|
|
|
75d8e7 |
index 1774423580..8df31298f5 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
|
|
|
75d8e7 |
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
|
|
|
75d8e7 |
@@ -95,21 +95,21 @@ jobs:
|
|
|
75d8e7 |
OVMF_IA32X64_FULL_DEBUG:
|
|
|
75d8e7 |
Build.File: "$(package)/PlatformCI/PlatformBuild.py"
|
|
|
75d8e7 |
Build.Arch: "IA32,X64"
|
|
|
75d8e7 |
- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
Build.Target: "DEBUG"
|
|
|
75d8e7 |
Run.Flags: $(run_flags)
|
|
|
75d8e7 |
Run: $(should_run)
|
|
|
75d8e7 |
OVMF_IA32X64_FULL_RELEASE:
|
|
|
75d8e7 |
Build.File: "$(package)/PlatformCI/PlatformBuild.py"
|
|
|
75d8e7 |
Build.Arch: "IA32,X64"
|
|
|
75d8e7 |
- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
Build.Target: "RELEASE"
|
|
|
75d8e7 |
Run.Flags: $(run_flags)
|
|
|
75d8e7 |
Run: $(should_run)
|
|
|
75d8e7 |
OVMF_IA32X64_FULL_NOOPT:
|
|
|
75d8e7 |
Build.File: "$(package)/PlatformCI/PlatformBuild.py"
|
|
|
75d8e7 |
Build.Arch: "IA32,X64"
|
|
|
75d8e7 |
- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
Build.Target: "NOOPT"
|
|
|
75d8e7 |
Run.Flags: $(run_flags)
|
|
|
75d8e7 |
Run: $(should_run)
|
|
|
75d8e7 |
diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
|
|
|
75d8e7 |
index 09f9851312..68b5d951e9 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
|
|
|
75d8e7 |
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
|
|
|
75d8e7 |
@@ -94,14 +94,14 @@ jobs:
|
|
|
75d8e7 |
OVMF_IA32X64_FULL_DEBUG:
|
|
|
75d8e7 |
Build.File: "$(package)/PlatformCI/PlatformBuild.py"
|
|
|
75d8e7 |
Build.Arch: "IA32,X64"
|
|
|
75d8e7 |
- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
Build.Target: "DEBUG"
|
|
|
75d8e7 |
Run.Flags: $(run_flags)
|
|
|
75d8e7 |
Run: $(should_run)
|
|
|
75d8e7 |
OVMF_IA32X64_FULL_RELEASE:
|
|
|
75d8e7 |
Build.File: "$(package)/PlatformCI/PlatformBuild.py"
|
|
|
75d8e7 |
Build.Arch: "IA32,X64"
|
|
|
75d8e7 |
- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
Build.Target: "RELEASE"
|
|
|
75d8e7 |
Run.Flags: $(run_flags)
|
|
|
75d8e7 |
Run: $(should_run)
|
|
|
75d8e7 |
@@ -112,7 +112,7 @@ jobs:
|
|
|
75d8e7 |
# OVMF_IA32X64_FULL_NOOPT:
|
|
|
75d8e7 |
# Build.File: "$(package)/PlatformCI/PlatformBuild.py"
|
|
|
75d8e7 |
# Build.Arch: "IA32,X64"
|
|
|
75d8e7 |
- # Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
+ # Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
|
|
|
75d8e7 |
# Build.Target: "NOOPT"
|
|
|
75d8e7 |
# Run.Flags: $(run_flags)
|
|
|
75d8e7 |
# Run: $(should_run)
|
|
|
75d8e7 |
diff --git a/OvmfPkg/PlatformCI/ReadMe.md b/OvmfPkg/PlatformCI/ReadMe.md
|
|
|
75d8e7 |
index 44aa7c4a9d..1216dee126 100644
|
|
|
75d8e7 |
--- a/OvmfPkg/PlatformCI/ReadMe.md
|
|
|
75d8e7 |
+++ b/OvmfPkg/PlatformCI/ReadMe.md
|
|
|
75d8e7 |
@@ -14,7 +14,7 @@ supported and are described below.
|
|
|
75d8e7 |
| IA32 | IA32 | OvmfPkgIa32.dsc | None |
|
|
|
75d8e7 |
| X64 | X64 | OvmfPkgIa64.dsc | None |
|
|
|
75d8e7 |
| IA32 X64 | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | None |
|
|
|
75d8e7 |
-| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM_ENABLE=1 NETWORK_TLS_ENABLE=1 NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 |
|
|
|
75d8e7 |
+| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM1_ENABLE=1 TPM2_ENABLE=1 NETWORK_TLS_ENABLE=1 NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 |
|
|
|
75d8e7 |
|
|
|
75d8e7 |
## EDK2 Developer environment
|
|
|
75d8e7 |
|
|
|
75d8e7 |
--
|
|
|
75d8e7 |
2.27.0
|
|
|
75d8e7 |
|