summaryrefslogtreecommitdiff
path: root/src/pc80
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2011-10-27 21:28:25 +0000
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-03-30 02:10:41 +0200
commitc668af74412cb7cae24957e9a86320be5493434d (patch)
tree4bb3fa95e196e0a0137d66ee481041c0ba6831a9 /src/pc80
parent3008bbadcbbb64dab0472e1724744c37b4094aa9 (diff)
Make TPM driver work in rom stage.
Change-Id: Ifc827d0cd0159aa3f6752d395974f2812334f262 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/738 Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/pc80')
-rw-r--r--src/pc80/tpm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/pc80/tpm.c b/src/pc80/tpm.c
index 1cbf800571..8e94303e71 100644
--- a/src/pc80/tpm.c
+++ b/src/pc80/tpm.c
@@ -35,6 +35,7 @@
#include <arch/byteorder.h>
#include <console/console.h>
#include <pc80/tpm.h>
+#include <cpu/x86/car.h>
#ifdef DEBUG
#define TPM_DEBUG_ON 1
@@ -130,10 +131,10 @@ struct device_name {
struct vendor_name {
u16 vendor_id;
const char * vendor_name;
- struct device_name* dev_names;
+ const struct device_name* dev_names;
};
-static struct device_name infineon_devices[] = {
+static const struct device_name infineon_devices[] = {
{0xb, "SLB9635 TT 1.2"},
{0}
};
@@ -146,7 +147,7 @@ static const struct vendor_name vendor_names[] = {
* Cached vendor/device ID pair to indicate that the device has been already
* discovered
*/
-static u32 vendor_dev_id;
+static u32 vendor_dev_id CAR_GLOBAL;
static int is_byte_reg(u32 reg)
{