Update PCR state with the state of the firmware keyblock flags too.
I re-factored the extend call into its own module, since it doesn't necessarily
need to be couple with rollbackfirmwaresetup.
BUG=chrome-os-partner:2372
TEST=Tried emerge-x86-generic and emerge-arm-generic vboot_reference.
Change-Id: I0d3115b10b686133e63e304570325ebdbd50ae3a
Review URL: http://codereview.chromium.org/6696006
diff --git a/firmware/linktest/main.c b/firmware/linktest/main.c
index 6f5b83e..16c4bf5 100644
--- a/firmware/linktest/main.c
+++ b/firmware/linktest/main.c
@@ -8,6 +8,7 @@
#include "load_kernel_fw.h"
#include "rollback_index.h"
#include "tlcl.h"
+#include "tpm_bootmode.h"
#include "vboot_common.h"
#include "vboot_kernel.h"
#include "vboot_nvstorage.h"
@@ -37,6 +38,9 @@
RollbackKernelWrite(0);
RollbackKernelLock();
+ /* tpm_bootmode.c */
+ SetTPMBootModeState(0, 0, 0);
+
/* tlcl.h */
TlclLibInit();
TlclCloseDevice();