diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2013-03-22 11:01:37 -0700 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-03-30 22:07:04 +0100 |
| commit | f6763db83e7cf45f1ece8c1c8ecefe2b6a9f886d (patch) | |
| tree | 0b3642525069eebdd4894df8ba6c0bc8496b7545 | |
| parent | 08e3656b517cf029dec5f9830c2e09b947e46e8b (diff) | |
wtm1/wtm2/baskingridge: Enable TPM ACPI device
This enables the TPM device in ACPI tables so the OS is able
to probe for the TPM without needing it be force loaded.
Change-Id: I21e660ac1c12e3e1341cf266cf8f0bf03763df5a
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: http://review.coreboot.org/2968
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | src/mainboard/intel/baskingridge/acpi_tables.c | 3 | ||||
| -rw-r--r-- | src/mainboard/intel/baskingridge/dsdt.asl | 4 | ||||
| -rw-r--r-- | src/mainboard/intel/wtm1/acpi_tables.c | 3 | ||||
| -rw-r--r-- | src/mainboard/intel/wtm1/dsdt.asl | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/wtm2/acpi_tables.c | 3 | ||||
| -rw-r--r-- | src/mainboard/intel/wtm2/dsdt.asl | 2 |
6 files changed, 16 insertions, 1 deletions
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c index 5131ec14fa..d94251ebda 100644 --- a/src/mainboard/intel/baskingridge/acpi_tables.c +++ b/src/mainboard/intel/baskingridge/acpi_tables.c @@ -89,6 +89,9 @@ static void acpi_create_gnvs(global_nvs_t *gnvs) /* CBMEM TOC */ gnvs->cmem = 0; + /* TPM Present */ + gnvs->tpmp = 1; + /* IGD Displays */ gnvs->ndid = 3; gnvs->did[0] = 0x80000100; diff --git a/src/mainboard/intel/baskingridge/dsdt.asl b/src/mainboard/intel/baskingridge/dsdt.asl index 79bb8f39f8..a56562ef51 100644 --- a/src/mainboard/intel/baskingridge/dsdt.asl +++ b/src/mainboard/intel/baskingridge/dsdt.asl @@ -2,7 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2007-2009 coresystems GmbH - * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. + * Copyright 2011 Google Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#define ENABLE_TPM + DefinitionBlock( "dsdt.aml", "DSDT", diff --git a/src/mainboard/intel/wtm1/acpi_tables.c b/src/mainboard/intel/wtm1/acpi_tables.c index 4232afc673..6f5a1ddb77 100644 --- a/src/mainboard/intel/wtm1/acpi_tables.c +++ b/src/mainboard/intel/wtm1/acpi_tables.c @@ -86,6 +86,9 @@ static void acpi_create_gnvs(global_nvs_t *gnvs) /* CBMEM TOC */ gnvs->cmem = 0; + /* TPM Present */ + gnvs->tpmp = 1; + /* IGD Displays */ gnvs->ndid = 3; gnvs->did[0] = 0x80000100; diff --git a/src/mainboard/intel/wtm1/dsdt.asl b/src/mainboard/intel/wtm1/dsdt.asl index 965f5014cd..81e39c324d 100644 --- a/src/mainboard/intel/wtm1/dsdt.asl +++ b/src/mainboard/intel/wtm1/dsdt.asl @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#define ENABLE_TPM + DefinitionBlock( "dsdt.aml", "DSDT", diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c index 4232afc673..6f5a1ddb77 100644 --- a/src/mainboard/intel/wtm2/acpi_tables.c +++ b/src/mainboard/intel/wtm2/acpi_tables.c @@ -86,6 +86,9 @@ static void acpi_create_gnvs(global_nvs_t *gnvs) /* CBMEM TOC */ gnvs->cmem = 0; + /* TPM Present */ + gnvs->tpmp = 1; + /* IGD Displays */ gnvs->ndid = 3; gnvs->did[0] = 0x80000100; diff --git a/src/mainboard/intel/wtm2/dsdt.asl b/src/mainboard/intel/wtm2/dsdt.asl index ed953c44c8..112a47ab4a 100644 --- a/src/mainboard/intel/wtm2/dsdt.asl +++ b/src/mainboard/intel/wtm2/dsdt.asl @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#define ENABLE_TPM + DefinitionBlock( "dsdt.aml", "DSDT", |