diff options
| author | Julius Werner <jwerner@chromium.org> | 2021-05-18 17:15:50 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2021-05-27 22:01:44 +0000 |
| commit | 8ad93797d6e1eb2d4be4010e29152636551567fa (patch) | |
| tree | a17b9d2c794b854057f169f9e7486c69885e6f7a /src/mainboard/protectli/vault_kbl | |
| parent | 9d8a5ba128d7e5a8b6fbedf79c4c470acc918b4c (diff) | |
tpm: Remove USER_TPMx options, make TPM1/TPM2 menuconfig visible
We would like to have an easy way to completely disable TPM support on a
board. For boards that don't pre-select a TPM protocol via the
MAINBOARD_HAS_TPMx options, this is already possible with the
USER_NO_TPM option. In order to make this available for all boards, this
patch just removes the whole USER_TPMx option group and directly makes
the TPM1 and TPM2 options visible to menuconfig. The MAINBOARD_HAS_TPMx
options can still be used to select defaults and to prevent selection of
a protocol that the TPM is known to not support, but the NO_TPM option
always remains available.
Also fix some mainboards that selected TPM2 directly, which they're not
supposed to do (that's what MAINBOARD_HAS_TPM2 is for), and add a
missing dependency to TPM_CR50 so it is set correctly for a NO_TPM
scenario.
Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: Ib0a73da3c42fa4e8deffecb53f29ee38cbb51a93
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54641
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Christian Walter <christian.walter@9elements.com>
Diffstat (limited to 'src/mainboard/protectli/vault_kbl')
| -rw-r--r-- | src/mainboard/protectli/vault_kbl/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mainboard/protectli/vault_kbl/Kconfig b/src/mainboard/protectli/vault_kbl/Kconfig index 7cf80e0a91..7aa78aab13 100644 --- a/src/mainboard/protectli/vault_kbl/Kconfig +++ b/src/mainboard/protectli/vault_kbl/Kconfig @@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS select SUPERIO_ITE_IT8772F select MAINBOARD_HAS_CRB_TPM select HAVE_INTEL_PTT - select TPM2 + select MAINBOARD_HAS_TPM2 config IRQ_SLOT_COUNT int |