summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2021-05-18 17:15:50 -0700
committerJulius Werner <jwerner@chromium.org>2021-05-27 22:01:44 +0000
commit8ad93797d6e1eb2d4be4010e29152636551567fa (patch)
treea17b9d2c794b854057f169f9e7486c69885e6f7a /configs
parent9d8a5ba128d7e5a8b6fbedf79c4c470acc918b4c (diff)
downloadcoreboot-8ad93797d6e1eb2d4be4010e29152636551567fa.tar.gz
coreboot-8ad93797d6e1eb2d4be4010e29152636551567fa.tar.bz2
coreboot-8ad93797d6e1eb2d4be4010e29152636551567fa.zip
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 'configs')
-rw-r--r--configs/config.asrock_b85m_pro4.tpm2_txt_placeholder_acms2
-rw-r--r--configs/config.libretrend_lt10002
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/config.asrock_b85m_pro4.tpm2_txt_placeholder_acms b/configs/config.asrock_b85m_pro4.tpm2_txt_placeholder_acms
index 856701fee8bc..4edeb0cc7bb3 100644
--- a/configs/config.asrock_b85m_pro4.tpm2_txt_placeholder_acms
+++ b/configs/config.asrock_b85m_pro4.tpm2_txt_placeholder_acms
@@ -3,7 +3,7 @@
# Used ACMs were extracted from a Supermicro X10SLH firmware update.
CONFIG_VENDOR_ASROCK=y
CONFIG_BOARD_ASROCK_B85M_PRO4=y
-CONFIG_USER_TPM2=y
+CONFIG_TPM2=y
CONFIG_INTEL_TXT=y
CONFIG_INTEL_TXT_BIOSACM_FILE="3rdparty/blobs/cpu/intel/stm/stm.bin"
CONFIG_INTEL_TXT_SINITACM_FILE="3rdparty/blobs/cpu/intel/stm/stm.bin"
diff --git a/configs/config.libretrend_lt1000 b/configs/config.libretrend_lt1000
index f12ae3f81c01..33159f16daec 100644
--- a/configs/config.libretrend_lt1000
+++ b/configs/config.libretrend_lt1000
@@ -1,5 +1,5 @@
CONFIG_VENDOR_LIBRETREND=y
CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
-CONFIG_USER_TPM2=y
+CONFIG_TPM2=y
CONFIG_SEABIOS_ADD_SERCON_PORT_FILE=y