Add TPM support to coreboot

[coreboot.git] / src / arch / x86 / boot / acpi.c

diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index f1be0345e491b4d39270d907ed027467aee3afa1..33d730bc8c2f0eb90d5ade3c9781f9993b29a287 100644 (file)
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -31,6 +31,10 @@
 #include <arch/acpigen.h>
 #include <device/pci.h>
 #include <cbmem.h>
+#include <cpu/x86/lapic_def.h>
+#if CONFIG_CHROMEOS
+#include <vendorcode/google/chromeos/chromeos.h>
+#endif
 
 u8 acpi_checksum(u8 *table, u32 length)
 {
@@ -188,8 +192,6 @@ int acpi_create_madt_lapic_nmi(acpi_madt_lapic_nmi_t *lapic_nmi, u8 cpu,
 
 void acpi_create_madt(acpi_madt_t *madt)
 {
-#define LOCAL_APIC_ADDR        0xfee00000ULL
-
        acpi_header_t *header = &(madt->header);
        unsigned long current = (unsigned long)madt + sizeof(acpi_madt_t);
 
@@ -525,6 +527,11 @@ void *acpi_find_wakeup_vector(void)
        if (!acpi_is_wakeup())
                return NULL;
 
+#if CONFIG_CHROMEOS
+       printk(BIOS_DEBUG, "Verified boot TPM initialization.\n");
+       init_vboot();
+#endif
+
        printk(BIOS_DEBUG, "Trying to find the wakeup vector...\n");
 
        /* Find RSDP. */