Julius Werner (jwerner@chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16229
-gerrit
commit 125aa49ee8eddb1597c3b8353dc062e38c17854a Author: Julius Werner jwerner@chromium.org Date: Mon Aug 15 16:10:27 2016 -0700
vboot: Move TPM-related Kconfig selects from CHROMEOS to VBOOT
CONFIG_VBOOT was recently moved to be independent from CONFIG_CHROMEOS. However, the latter still has some 'select' clauses to ensure that required TPM libraries are built. The TPM is an essential part of vboot, and without these libraries the vboot code cannot compile... therefore, they should be moved under CONFIG_VBOOT.
Change-Id: I0145558e5127c65c6a82d62f25b5a39e24cb8726 Signed-off-by: Julius Werner jwerner@chromium.org --- src/vboot/Kconfig | 4 ++++ src/vendorcode/google/chromeos/Kconfig | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/vboot/Kconfig b/src/vboot/Kconfig index a008208..0838167 100644 --- a/src/vboot/Kconfig +++ b/src/vboot/Kconfig @@ -136,6 +136,10 @@ config VBOOT_OPROM_MATTERS config VBOOT bool "Verify firmware with vboot." default n + 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 depends on HAVE_HARD_RESET help Enabling VBOOT will use vboot to verify the components of the firmware diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index 5134731..063a5a5 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -21,10 +21,6 @@ menu "ChromeOS" config CHROMEOS bool "Build for ChromeOS" default n - 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 ELOG if SPI_FLASH select COLLECT_TIMESTAMPS select VBOOT