From 369ae53ef49fe0b5f0854bc61754f51aa4dd9706 Mon Sep 17 00:00:00 2001 From: Itamar Date: Fri, 31 Jul 2015 17:10:46 +0800 Subject: [PATCH] google/oak: Add support for verstage Add support for verstage [pg: split original commit into multiple commits] Change-Id: I8c9fe02f26bf8fa8381a7502a778bed300684986 Signed-off-by: Patrick Georgi Original-Commit-Id: 2827aa08ff8712c0245a22378f3ddb0ca054255d Original-Change-Id: I94a9ee2c00e25a37a92133f813d0cd11a3503656 Original-Signed-off-by: Yidi Lin Original-Reviewed-on: https://chromium-review.googlesource.com/292662 Original-Reviewed-by: Julius Werner Reviewed-on: https://review.coreboot.org/13052 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/google/oak/Kconfig | 10 ++++++++++ src/mainboard/google/oak/Makefile.inc | 3 +++ 2 files changed, 13 insertions(+) diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig index 82e83e7ab0..2e311a7609 100644 --- a/src/mainboard/google/oak/Kconfig +++ b/src/mainboard/google/oak/Kconfig @@ -24,10 +24,12 @@ config BOARD_SPECIFIC_OPTIONS select EC_GOOGLE_CHROMEEC_SPI select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT + select MAINBOARD_HAS_CHROMEOS config CHROMEOS select CHROMEOS_VBNV_EC select EC_SOFTWARE_SYNC + select VBOOT2_MOCK_SECDATA select VIRTUAL_DEV_SWITCH config MAINBOARD_DIR @@ -46,4 +48,12 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 0 +config DRIVER_TPM_I2C_BUS + hex + default 0x2 + +config DRIVER_TPM_I2C_ADDR + hex + default 0x20 + endif # BOARD_GOOGLE_OAK diff --git a/src/mainboard/google/oak/Makefile.inc b/src/mainboard/google/oak/Makefile.inc index f2e1a1ad21..c7f0401b1c 100644 --- a/src/mainboard/google/oak/Makefile.inc +++ b/src/mainboard/google/oak/Makefile.inc @@ -18,6 +18,9 @@ bootblock-y += memlayout.ld bootblock-y += chromeos.c bootblock-y += boardid.c +verstage-y += chromeos.c +verstage-y += memlayout.ld + romstage-y += chromeos.c romstage-y += romstage.c romstage-y += memlayout.ld