From 7a835189b1ea94a878ff33afe15b3ee62e933a9e Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 4 Dec 2017 17:47:02 -0800 Subject: [PATCH] mb/google/poppy: Remove dynamic disabling of TPM This change removes the dynamic disabling of TPM based on config options. Poppy and its variants will have only one type of TPM supported and so there is no need to update it dynamically. Change-Id: Ie82825fcf7092e845583edaac9ba0d3fc9d1dd80 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/22704 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/mainboard/google/poppy/mainboard.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/mainboard/google/poppy/mainboard.c b/src/mainboard/google/poppy/mainboard.c index 3558ce0c92..743a920a0f 100644 --- a/src/mainboard/google/poppy/mainboard.c +++ b/src/mainboard/google/poppy/mainboard.c @@ -57,24 +57,9 @@ static unsigned long mainboard_write_acpi_tables(device_t device, static void mainboard_enable(device_t dev) { - device_t tpm; - dev->ops->init = mainboard_init; dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator; dev->ops->write_acpi_tables = mainboard_write_acpi_tables; - - /* Disable unused interface(s) for TPM. */ - if (!IS_ENABLED(CONFIG_POPPY_USE_SPI_TPM)) { - tpm = PCH_DEV_GSPI0; - if (tpm) - tpm->enabled = 0; - } - - if (!IS_ENABLED(CONFIG_POPPY_USE_I2C_TPM)) { - tpm = PCH_DEV_I2C1; - if (tpm) - tpm->enabled = 0; - } } struct chip_operations mainboard_ops = {