summaryrefslogtreecommitdiff
path: root/src/vendorcode
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2015-11-19 18:24:30 -0700
committerMartin Roth <martinroth@google.com>2015-11-21 03:40:31 +0100
commit4aac08afecd51eb7f3e776d3422767dba0d49030 (patch)
treef486fdd9d50a582f79b863157270a8a3bf2b04af /src/vendorcode
parent965704a96217b2ac5402b5b39940fa5a4277590e (diff)
downloadcoreboot-4aac08afecd51eb7f3e776d3422767dba0d49030.tar.xz
chromeos: Fix Kconfig TPM warnings on systems with no LPC TPM
Put dependecies on CHROMEOS's selection of the Kconfig symbols TPM_INIT_FAILURE_IS_FATAL and SKIP_TPM_STARTUP_ON_NORMAL_BOOT to match the dependencies on those symbols where they are defined in src/drivers/pc80/tpm/Kconfig The file that uses these only gets built in if CONFIG_LPC_TPM is selected selected. The warnings were: warning: (CHROMEOS) selects TPM_INIT_FAILURE_IS_FATAL which has unmet direct dependencies (PC80_SYSTEM && LPC_TPM) warning: (CHROMEOS) selects SKIP_TPM_STARTUP_ON_NORMAL_BOOT which has unmet direct dependencies (PC80_SYSTEM && LPC_TPM) Change-Id: I7af00c79050bf511758bf29e3d57f6ff34d2a296 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: http://review.coreboot.org/12497 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/vendorcode')
-rw-r--r--src/vendorcode/google/chromeos/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index 02bb227eb9..4d05b3e783 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -22,8 +22,8 @@ config CHROMEOS
bool "Build for ChromeOS"
default n
select TPM
- select TPM_INIT_FAILURE_IS_FATAL
- select SKIP_TPM_STARTUP_ON_NORMAL_BOOT
+ 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
select ELOG
select COLLECT_TIMESTAMPS