Rehaul of firmware TPM tests

utility/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.
 
 INCLUDES += -I./include \
                 -I$(FWDIR)/lib/include \
                 -I$(FWDIR)/lib/cgptlib/include \
                 -I$(FWDIR)/lib/cryptolib/include \
                 -I$(FWDIR)/lib/tpm_lite/include \
                 -I$(HOSTDIR)/include
@@ skipping 15 matching lines @@
                 tpm_init_temp_fix \
                 tpmc \
                 vbutil_firmware \
                 vbutil_kernel \
                 vbutil_key \
                 vbutil_keyblock \
                 verify_data \
                 dev_make_keypair \
                 dev_sign_file \
                 dump_fmap \
-                dev_debug_vboot
+                dev_debug_vboot \
 
 TARGET_BINS = $(addprefix ${BUILD_ROOT}/,$(TARGET_NAMES))
 ALL_DEPS = $(addsuffix .d,${TARGET_BINS})
 
 all: $(TARGET_BINS)
 
 ${BUILD_ROOT}/dumpRSAPublicKey: dumpRSAPublicKey.c
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ -lcrypto
 
 ${BUILD_ROOT}/dump_kernel_config: dump_kernel_config.c $(LIBS)
@@ skipping 25 matching lines @@
 
 ${BUILD_ROOT}/verify_data: verify_data.c $(LIBS)
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
 
 ${BUILD_ROOT}/sign_image: sign_image.c $(LIBS)
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) -lcrypto
 
 ${BUILD_ROOT}/tpm_init_temp_fix: tpm_init_temp_fix.c $(LIBS)
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
 
+${BUILD_ROOT}/tpm_set_readsrkpub: tpm_set_readsrkpub.c
+        $(CC) $(CFLAGS) $< -o $@ -ltspi
+
 ${BUILD_ROOT}/dev_make_keypair: dev_make_keypair
         cp -f $< $@
         chmod +x $@
 
 ${BUILD_ROOT}/dev_debug_vboot: dev_debug_vboot
         cp -f $< $@
         chmod +x $@
 
 ${BUILD_ROOT}/tpmc: tpmc.c $(LIBS)
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
@@ skipping 12 matching lines @@
 STRUCTURES_TMP=${BUILD}/tlcl_structures.tmp
 STRUCTURES_SRC=${FWDIR}/lib/tpm_lite/include/tlcl_structures.h
 
 update_tlcl_structures: ${BUILD_ROOT}/tlcl_generator
         ${BUILD_ROOT}/tlcl_generator > $(STRUCTURES_TMP)
         cmp -s $(STRUCTURES_TMP) $(STRUCTURES_SRC) || \
                 ( echo "%% Updating structures.h %%" && \
                   cp $(STRUCTURES_TMP) $(STRUCTURES_SRC) )
 
 -include ${ALL_DEPS}