google/kahlee: Enable TPM

Set up the TPM decode to SPI prior to verstage.
Enable LPC TPM and remove the mock data.

Note, Kahlee TPM is on SPI, but decoded by the LPC block.

BRANCH=none
BUG=b:62103024
TEST=coreboot and Depthcharge reports TPM found.

Change-Id: Iab92259ebeaa40937309fad05cc45d9ca6d41357
Signed-off-by: Marc Jones <marcj303@gmail.com>
Reviewed-on: https://review.coreboot.org/19848
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Marc Jones 2017-04-20 16:51:10 -06:00 committed by Martin Roth
parent 42e2064370
commit 583806a79d
3 changed files with 8 additions and 1 deletions

View File

@ -27,6 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select GFXUMA select GFXUMA
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select STONEYRIDGE_UART select STONEYRIDGE_UART
@ -51,7 +52,6 @@ config ONBOARD_VGA_IS_PRIMARY
default y default y
config VBOOT config VBOOT
select VBOOT_MOCK_SECDATA
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES
select VBOOT_LID_SWITCH select VBOOT_LID_SWITCH
select VBOOT_VBNV_CMOS select VBOOT_VBNV_CMOS

View File

@ -15,9 +15,13 @@
#include <bootblock_common.h> #include <bootblock_common.h>
#include <ec.h> #include <ec.h>
#include <soc/hudson.h>
void bootblock_mainboard_init(void) void bootblock_mainboard_init(void)
{ {
/* Enable the EC as soon as we have visibility */ /* Enable the EC as soon as we have visibility */
mainboard_ec_init(); mainboard_ec_init();
/* Setup TPM decode before verstage */
hudson_tpm_decode_spi();
} }

View File

@ -48,6 +48,9 @@ chip soc/amd/stoneyridge
chip ec/google/chromeec chip ec/google/chromeec
device pnp 0c09.0 on end device pnp 0c09.0 on end
end end
chip drivers/pc80/tpm
device pnp 0c31.0 on end
end
end # LPC 0x790e end # LPC 0x790e
device pci 14.7 on end # SD device pci 14.7 on end # SD
device pci 18.0 on end device pci 18.0 on end