From: Stefan Reinauer <stefan.reinauer@coreboot.org>
Date: Tue, 3 Apr 2012 16:53:48 +0000 (+0200)
Subject: Drop verified boot code from acpi.c
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=coreboot.git;a=commitdiff_plain;h=15511835b9e60d08ac5eb3c4ff326cec8c43ed6d

Drop verified boot code from acpi.c

We changed our verified boot initialization to run from romstage,
as that allows faster boot times and does not add as much ChromeOS
specific code to generic files.

Change-Id: Id4164c26d524ea0ffce34467cf91379a19a4b2f6
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/851
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
---

diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index ab67d38b8..f81127a02 100644
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -35,9 +35,6 @@
 #if CONFIG_COLLECT_TIMESTAMPS
 #include <timestamp.h>
 #endif
-#if CONFIG_CHROMEOS
-#include <vendorcode/google/chromeos/chromeos.h>
-#endif
 
 u8 acpi_checksum(u8 *table, u32 length)
 {
@@ -530,11 +527,6 @@ 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. */