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)

diff --git a/src/pc80/tpm.c b/src/pc80/tpm.c
index 1cbf80057127363b5a222adbb9cc9a2d1558a700..8e94303e71c2c5bef12ce55b91268f6fc6bdd3c9 100644 (file)
--- 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)
 {