diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2013-03-27 00:16:11 -0500 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-04-01 23:26:17 +0200 |
| commit | 0703ec4fb2f0342e88fa50dfae21710019774ad1 (patch) | |
| tree | 9f366be684d697f4c420586e3d889f78000c0fa6 | |
| parent | d6d6db3717d09f2b6a4590eec6016ca7d417c2f9 (diff) | |
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>
| -rw-r--r-- | src/vendorcode/google/chromeos/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/vboot.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 230523c968..4fa22ea931 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -31,6 +31,12 @@ ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/chromeos.c romstage-srcs += src/mainboard/$(MAINBOARDDIR)/chromeos.c endif +ifeq ($(MOCK_TPM),1) +CFLAGS += -DMOCK_TPM=1 +else +CFLAGS += -DMOCK_TPM=0 +endif + ifeq ($(CONFIG_VBOOT_VERIFY_FIRMWARE),y) romstage-y += vboot_loader.c rmodules-y += vboot_wrapper.c diff --git a/src/vendorcode/google/chromeos/vboot.c b/src/vendorcode/google/chromeos/vboot.c index 0f30547056..03d759cefc 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 |