summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2016-08-15 16:10:27 -0700
committerJulius Werner <jwerner@chromium.org>2016-08-16 23:14:21 +0200
commit4157bd8d61ad709a29072cb4505b3cc7463e515b (patch)
tree8f0aedb5913b83ec6788792522306be509c2539b
parent5fa08f3c0f34fec0fa3bf0a34425c96932d62931 (diff)
downloadcoreboot-4157bd8d61ad709a29072cb4505b3cc7463e515b.tar.xz
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> Reviewed-on: https://review.coreboot.org/16229 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-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