From df1a0652152f603d8147ab91017ab454db5512a7 Mon Sep 17 00:00:00 2001 From: Philipp Deppenwiese Date: Sat, 28 Jul 2018 19:13:04 +0200 Subject: [PATCH] mainboard/opencellular/rotundu: Enable TPM 1.2 support * Enable support for all variants. Change-Id: Ibdd43d8cff23d3fa1154e2b72aa6095682783fe5 Signed-off-by: Philipp Deppenwiese Reviewed-on: https://review.coreboot.org/27685 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/mainboard/opencellular/rotundu/Kconfig | 2 ++ src/mainboard/opencellular/rotundu/acpi_tables.c | 2 +- .../opencellular/rotundu/variants/rotundu/devicetree.cb | 6 +++++- .../opencellular/rotundu/variants/supabrckv1/devicetree.cb | 6 +++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/mainboard/opencellular/rotundu/Kconfig b/src/mainboard/opencellular/rotundu/Kconfig index 9b50cef7fc..a062a7a95d 100644 --- a/src/mainboard/opencellular/rotundu/Kconfig +++ b/src/mainboard/opencellular/rotundu/Kconfig @@ -27,6 +27,8 @@ config BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU select HAVE_ACPI_RESUME select USE_BLOBS select HAVE_FSP_BIN if FSP_PACKAGE_DEFAULT + select MAINBOARD_HAS_LPC_TPM + select MAINBOARD_HAS_TPM1 if BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU diff --git a/src/mainboard/opencellular/rotundu/acpi_tables.c b/src/mainboard/opencellular/rotundu/acpi_tables.c index eeb961832e..4f95bff3e6 100644 --- a/src/mainboard/opencellular/rotundu/acpi_tables.c +++ b/src/mainboard/opencellular/rotundu/acpi_tables.c @@ -36,7 +36,7 @@ void acpi_create_gnvs(global_nvs_t *gnvs) gnvs->s5u1 = 0; /* TPM Present */ - gnvs->tpmp = 0; + gnvs->tpmp = 1; /* Enable DPTF */ gnvs->dpte = 0; diff --git a/src/mainboard/opencellular/rotundu/variants/rotundu/devicetree.cb b/src/mainboard/opencellular/rotundu/variants/rotundu/devicetree.cb index a31a001657..7eeac7ad84 100644 --- a/src/mainboard/opencellular/rotundu/variants/rotundu/devicetree.cb +++ b/src/mainboard/opencellular/rotundu/variants/rotundu/devicetree.cb @@ -75,7 +75,11 @@ chip soc/intel/fsp_baytrail device pci 1e.3 on end # 8086 0F0A - HSUART 1 device pci 1e.4 off end # 8086 0F0C - HSUART 2 device pci 1e.5 off end # 8086 0F0E - SPI - device pci 1f.0 on end # 8086 0F1C - LPC bridge + device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end + end # 8086 0F1C - LPC bridge device pci 1f.3 on end # 8086 0F12 - SMBus 0 end end diff --git a/src/mainboard/opencellular/rotundu/variants/supabrckv1/devicetree.cb b/src/mainboard/opencellular/rotundu/variants/supabrckv1/devicetree.cb index df089229f4..c0bd2f0fe2 100644 --- a/src/mainboard/opencellular/rotundu/variants/supabrckv1/devicetree.cb +++ b/src/mainboard/opencellular/rotundu/variants/supabrckv1/devicetree.cb @@ -75,7 +75,11 @@ chip soc/intel/fsp_baytrail device pci 1e.3 on end # 8086 0F0A - HSUART 1 device pci 1e.4 off end # 8086 0F0C - HSUART 2 device pci 1e.5 off end # 8086 0F0E - SPI - device pci 1f.0 on end # 8086 0F1C - LPC bridge + device pci 1f.0 on + chip drivers/pc80/tpm + device pnp 0c31.0 on end + end + end # 8086 0F1C - LPC bridge device pci 1f.3 on end # 8086 0F12 - SMBus 0 end end