Skip to content

Commit 5711ff4

Browse files
kraxelmergify[bot]
kraxel
authored and
mergify[bot]
committed
OvmfPkg: drop TPM_CONFIG_ENABLE
Drop TPM_CONFIG_ENABLE config option. Including TPM support in the build without also including the TPM configuration menu is not useful. Suggested-by: Stefan Berger <stefanb@linux.ibm.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Tested-by: Stefan Berger <stefanb@linux.ibm.com>
1 parent b475758 commit 5711ff4

File tree

7 files changed

+8
-13
lines changed

7 files changed

+8
-13
lines changed

‎OvmfPkg/OvmfTpmComponentsDxe.dsc.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
1515
NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
1616
}
17-
!if $(TPM_CONFIG_ENABLE) == TRUE
1817
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
19-
!endif
2018
SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {
2119
<LibraryClasses>
2220
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf

‎OvmfPkg/OvmfTpmDefines.dsc.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
##
44

55
DEFINE TPM_ENABLE = FALSE
6-
DEFINE TPM_CONFIG_ENABLE = FALSE

‎OvmfPkg/OvmfTpmDxe.fdf.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@
66
INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
77
INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
88
INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
9-
!if $(TPM_CONFIG_ENABLE) == TRUE
109
INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
1110
!endif
12-
!endif

‎OvmfPkg/OvmfTpmPcdsHii.dsc.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: BSD-2-Clause-Patent
33
##
44

5-
!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE
5+
!if $(TPM_ENABLE) == TRUE
66
gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS
77
gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS
88
!endif

‎OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,21 @@ jobs:
9595
OVMF_IA32X64_FULL_DEBUG:
9696
Build.File: "$(package)/PlatformCI/PlatformBuild.py"
9797
Build.Arch: "IA32,X64"
98-
Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
98+
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"
9999
Build.Target: "DEBUG"
100100
Run.Flags: $(run_flags)
101101
Run: $(should_run)
102102
OVMF_IA32X64_FULL_RELEASE:
103103
Build.File: "$(package)/PlatformCI/PlatformBuild.py"
104104
Build.Arch: "IA32,X64"
105-
Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
105+
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"
106106
Build.Target: "RELEASE"
107107
Run.Flags: $(run_flags)
108108
Run: $(should_run)
109109
OVMF_IA32X64_FULL_NOOPT:
110110
Build.File: "$(package)/PlatformCI/PlatformBuild.py"
111111
Build.Arch: "IA32,X64"
112-
Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
112+
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"
113113
Build.Target: "NOOPT"
114114
Run.Flags: $(run_flags)
115115
Run: $(should_run)

‎OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ jobs:
9494
OVMF_IA32X64_FULL_DEBUG:
9595
Build.File: "$(package)/PlatformCI/PlatformBuild.py"
9696
Build.Arch: "IA32,X64"
97-
Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
97+
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"
9898
Build.Target: "DEBUG"
9999
Run.Flags: $(run_flags)
100100
Run: $(should_run)
101101
OVMF_IA32X64_FULL_RELEASE:
102102
Build.File: "$(package)/PlatformCI/PlatformBuild.py"
103103
Build.Arch: "IA32,X64"
104-
Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
104+
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"
105105
Build.Target: "RELEASE"
106106
Run.Flags: $(run_flags)
107107
Run: $(should_run)
@@ -112,7 +112,7 @@ jobs:
112112
# OVMF_IA32X64_FULL_NOOPT:
113113
# Build.File: "$(package)/PlatformCI/PlatformBuild.py"
114114
# Build.Arch: "IA32,X64"
115-
# Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
115+
# 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"
116116
# Build.Target: "NOOPT"
117117
# Run.Flags: $(run_flags)
118118
# Run: $(should_run)

‎OvmfPkg/PlatformCI/ReadMe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ supported and are described below.
1414
| IA32 | IA32 | OvmfPkgIa32.dsc | None |
1515
| X64 | X64 | OvmfPkgIa64.dsc | None |
1616
| IA32 X64 | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | None |
17-
| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM_ENABLE=1 TPM_CONFIG_ENABLE=1 NETWORK_TLS_ENABLE=1 NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 |
17+
| 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 |
1818

1919
## EDK2 Developer environment
2020

0 commit comments

Comments
 (0)