GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Julius Werner 2016-08-15 16:10:27 -07:00
parent 5fa08f3c0f
commit 4157bd8d61
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vboot/Kconfig
View File

@ -136,6 +136,10 @@ config VBOOT_OPROM_MATTERS
config VBOOT config VBOOT
bool "Verify firmware with vboot." bool "Verify firmware with vboot."
default n 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 depends on HAVE_HARD_RESET
help help
Enabling VBOOT will use vboot to verify the components of the firmware Enabling VBOOT will use vboot to verify the components of the firmware

4
src/vendorcode/google/chromeos/Kconfig
View File

@ -21,10 +21,6 @@ menu "ChromeOS"
config CHROMEOS config CHROMEOS
bool "Build for ChromeOS" bool "Build for ChromeOS"
default n 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 ELOG if SPI_FLASH
select COLLECT_TIMESTAMPS select COLLECT_TIMESTAMPS
select VBOOT select VBOOT