Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10278
-gerrit
commit 7c1053fbf245f002cef42c01fe02b3f5e1474a29 Author: Vladimir Serbinenko phcoder@gmail.com Date: Thu May 21 09:28:14 2015 +0200
x201: Add TPM declaration.
This allows to deactivate TPM on X201.
Change-Id: Ic085db6cc2c57668e7a4fdbc7440735c806cc256 Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/mainboard/lenovo/x201/Kconfig | 1 + src/mainboard/lenovo/x201/devicetree.cb | 3 +++ src/mainboard/lenovo/x201/dsdt.asl | 8 ++++++++ src/mainboard/lenovo/x201/romstage.c | 5 +++++ 4 files changed, 17 insertions(+)
diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig index 93bfb02..7f96cbe 100644 --- a/src/mainboard/lenovo/x201/Kconfig +++ b/src/mainboard/lenovo/x201/Kconfig @@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select SUPERIO_NSC_PC87382 select DRIVERS_LENOVO_WACOM + select MAINBOARD_HAS_LPC_TPM
config MAINBOARD_DIR string diff --git a/src/mainboard/lenovo/x201/devicetree.cb b/src/mainboard/lenovo/x201/devicetree.cb index 402b9d4..448b2a7 100644 --- a/src/mainboard/lenovo/x201/devicetree.cb +++ b/src/mainboard/lenovo/x201/devicetree.cb @@ -154,6 +154,9 @@ chip northbridge/intel/nehalem # DLPC, not connected device pnp 164e.19 off end end + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end end device pci 1f.2 on # IDE/SATA subsystemid 0x17aa 0x2168 diff --git a/src/mainboard/lenovo/x201/dsdt.asl b/src/mainboard/lenovo/x201/dsdt.asl index 5265a91..b6a563e 100644 --- a/src/mainboard/lenovo/x201/dsdt.asl +++ b/src/mainboard/lenovo/x201/dsdt.asl @@ -88,6 +88,14 @@ DefinitionBlock( } }
+/* + * LPC Trusted Platform Module + */ +Scope (_SB.PCI0.LPCB) +{ + #include <drivers/pc80/tpm/acpi/tpm.asl> +} + /* Chipset specific sleep states */ #include <southbridge/intel/i82801gx/acpi/sleepstates.asl>
diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c index 624440a..09bc189 100644 --- a/src/mainboard/lenovo/x201/romstage.c +++ b/src/mainboard/lenovo/x201/romstage.c @@ -38,6 +38,7 @@ #include <timestamp.h> #include <arch/acpi.h> #include <cbmem.h> +#include <tpm.h>
#include "gpio.h" #include "dock.h" @@ -307,5 +308,9 @@ void main(unsigned long bist) } #endif
+#if CONFIG_LPC_TPM + init_tpm(s3resume); +#endif + timestamp_add_now(TS_END_ROMSTAGE); }