Move ContinueSelfTest to a later point to save time.

firmware/Makefile

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 FWTOP := $(shell pwd)
 LIBDIR = $(FWTOP)/lib
 STUBDIR = $(FWTOP)/stub
 TESTDIR = $(FWTOP)/linktest
 BUILD_ROOT := ${BUILD}/$(shell basename ${FWTOP})
 LIBS = $(FWLIB)  # Firmware library must be self-contained
 
 # Disable rollback TPM when compiling locally, since otherwise
 # load_kernel_test attempts to talk to the TPM.
 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 \
         -I$(LIBDIR)/cgptlib/include \
         -I$(LIBDIR)/cryptolib/include \
         -I$(LIBDIR)/tpm_lite/include
 
 ifeq ($(FIRMWARE_ARCH),)
 INCLUDES += -I$(STUBDIR)/include
 else
@@ skipping 39 matching lines @@
                 $(TESTDIR)/main.c $(STUB_OBJS) $(LIBS)
 else
 test : $(FWLIB)
 endif
 
 include ../common.mk
 
 $(FWLIB) : $(LIB_OBJS)
         rm -f $@
         ar qc $@ $^