summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/vboot/Kconfig4
-rw-r--r--src/vendorcode/google/chromeos/Kconfig4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/vboot/Kconfig b/src/vboot/Kconfig
index a0082082bd..08381677e3 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 5134731ee6..063a5a591c 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