diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2016-06-02 20:43:19 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-06-23 17:11:48 +0200 |
| commit | 26588707c569aa2aa0237c047283a5963faa2fb5 (patch) | |
| tree | 2b2e9484541e631bdaefb5adddbdddebb595bda4 /src/vendorcode/google/chromeos | |
| parent | 0e820ce7452462de14a8cb28b0359ec2ea45608d (diff) | |
| download | coreboot-26588707c569aa2aa0237c047283a5963faa2fb5.tar.xz | |
kconfig: allow various tpm type and interface permutations
Until now it was assumed that all TPM devices were of the same type
(TCG 1.2 spec compliant) and x86 based boards had LPC connected TPMs
and all other boards had I2C connected TPMs.
With the advent of TPM2 specification there is a need to be able to
configure different combinations of TPM types (TPM or TPM2) and
interfaces (LPC, I2C and SPI).
This patch allows to do it. Picking Chrome OS still assumes that the
board has a TPM device, but adding MAINBOARD_HAS_TPM2 to the board's
Kconfig will trigger including of TPM2 instead.
MAINBOARD_HAS_LPC_TPM forces the interface to be set to LPC, adding
SPI_TPM to the board config switches interface choice to SPI, and if
neither of the two is defined, the interface is assumed to be I2C.
BRANCH=none
BUG=chrome-os-partner:50645
TEST=verified that none of the generated board configurations change
as a result of this patch. With the rest of the stack in place it
is possible to configure different combinations of TPM types and
interfaces for ARM and x86 boards.
Change-Id: I24f2e3ee63636566bf2a867c51ed80a622672f07
Signed-off-by: Martin Roth <martinroth@chromium.org>
Original-Commit-Id: 5a25c1070560cd2734519f87dfbf401c135088d1
Original-Change-Id: I659e9301a4a4fe065ca6537ef1fa824a08d36321
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/349850
Original-Reviewed-by: Martin Roth <martinroth@chromium.org>
Reviewed-on: https://review.coreboot.org/15294
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@googlemail.com>
Diffstat (limited to 'src/vendorcode/google/chromeos')
| -rw-r--r-- | src/vendorcode/google/chromeos/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index 269c176e14..f97a4e14ea 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -21,7 +21,8 @@ menu "ChromeOS" config CHROMEOS bool "Build for ChromeOS" default n - select TPM + select TPM if !MAINBOARD_HAS_TPM2 + select TPM2 if MAINBOARD_HAS_TPM2 select TPM_INIT_FAILURE_IS_FATAL if PC80_SYSTEM && LPC_TPM select SKIP_TPM_STARTUP_ON_NORMAL_BOOT if PC80_SYSTEM && LPC_TPM select BOOTMODE_STRAPS |