Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(899)

Unified Diff: firmware/Makefile

Issue 6719005: Cherry-pick vboot_reference files from TOT to support crossystem (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@0.11.257.B
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | firmware/include/load_firmware_fw.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: firmware/Makefile
diff --git a/firmware/Makefile b/firmware/Makefile
index fcff8bb7364c08f1fec3b1c621f828442fa1d406..accc835c68c2de054f54c77265ff12d1646e2883 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -15,6 +15,24 @@ ifeq ($(FIRMWARE_ARCH),)
CFLAGS += -DDISABLE_ROLLBACK_TPM
endif
+# TPM-specific flags. These depend on the particular TPM we're targeting for.
+# They are needed here only for compiling parts of the firmware code into
+# user-level tests.
+
+# TPM_BLOCKING_CONTINUESELFTEST is defined if TPM_ContinueSelfTest blocks until
+# the self test has completed.
+
+CLAGS += -DTPM_BLOCKING_CONTINUESELFTEST
+
+# TPM_MANUAL_SELFTEST is defined if the self test must be started manually
+# (with a call to TPM_ContinueSelfTest) instead of starting automatically at
+# power on.
+#
+# We sincerely hope that TPM_BLOCKING_CONTINUESELFTEST and TPM_MANUAL_SELFTEST
+# are not both defined at the same time. (See comment in code.)
+
+# CLAGS += -DTPM_MANUAL_SELFTEST
+
INCLUDES = \
-I$(FWTOP)/include \
-I$(LIBDIR)/include \
@@ -40,6 +58,7 @@ LIB_SRCS = \
./lib/cryptolib/sha2.c \
./lib/cryptolib/sha_utility.c \
./lib/rollback_index.c \
+ ./lib/tpm_bootmode.c \
./lib/stateful_util.c \
./lib/tpm_lite/tlcl.c \
./lib/utility.c \
« no previous file with comments | « no previous file | firmware/include/load_firmware_fw.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698