aboutsummaryrefslogtreecommitdiffstats
path: root/src/vendorcode/google/chromeos/vboot.c
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2013-03-27 00:16:11 -0500
committerRonald G. Minnich <rminnich@gmail.com>2013-04-01 23:26:17 +0200
commit0703ec4fb2f0342e88fa50dfae21710019774ad1 (patch)
tree9f366be684d697f4c420586e3d889f78000c0fa6 /src/vendorcode/google/chromeos/vboot.c
parentd6d6db3717d09f2b6a4590eec6016ca7d417c2f9 (diff)
downloadcoreboot-0703ec4fb2f0342e88fa50dfae21710019774ad1.tar.gz
coreboot-0703ec4fb2f0342e88fa50dfae21710019774ad1.tar.xz
coreboot-0703ec4fb2f0342e88fa50dfae21710019774ad1.zip
chromeos: honor MOCK_TPM=1
The TPM code wasn't previously honoring MOCK_TPM=1. Because of this, boards with TPMs that didn't handle S3 resume properly would cause a hard reset. Allow one to build with MOCK_TPM=1 on the command line so that S3 can still work. Change-Id: I9adf06647de285c0b0a3203d8897be90d7783a1e Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/2976 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/vendorcode/google/chromeos/vboot.c')
-rw-r--r--src/vendorcode/google/chromeos/vboot.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vendorcode/google/chromeos/vboot.c b/src/vendorcode/google/chromeos/vboot.c
index 0f3054705..03d759cef 100644
--- a/src/vendorcode/google/chromeos/vboot.c
+++ b/src/vendorcode/google/chromeos/vboot.c
@@ -231,8 +231,10 @@ static void init_vboot(int bootmode)
return;
}
+#if !MOCK_TPM
printk(BIOS_ERR, "TPM: Error code 0x%x. Hard reset!\n", result);
hard_reset();
+#endif
}
#endif