Index: autotest/client/hardware_TPMFirmware/src/Makefile |
diff --git a/autotest/client/hardware_TPMFirmware/src/Makefile b/autotest/client/hardware_TPMFirmware/src/Makefile |
index d864f40deb65df09bb1d05f70765cda2b06c814c..0f9f35ae5581f321d084790a5a5c689a94131d6b 100644 |
--- a/autotest/client/hardware_TPMFirmware/src/Makefile |
+++ b/autotest/client/hardware_TPMFirmware/src/Makefile |
@@ -2,34 +2,24 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
-TPM = tpm |
-TPM_SRC_DIR = $(GCLIENT_ROOT)/src/third_party/$(TPM) |
-TPM_WORK_DIR = $(TPM) |
- |
-TLCL = tpm_lite |
-TLCL_SRC_DIR = $(GCLIENT_ROOT)/src/platform/$(TLCL) |
-TLCL_WORK_DIR = $(TLCL) |
- |
BINDIR = . |
PROGRAMS = \ |
- clear \ |
- enable \ |
- globallock \ |
- lock \ |
- readonly \ |
- writelimit |
+ earlyextend \ |
+ earlynvram \ |
+ earlynvram2 \ |
+ enable \ |
+ fastenable \ |
+ globallock \ |
+ redefine_unowned \ |
+ spaceperm \ |
+ testsetup \ |
+ timing \ |
+ writelimit \ |
zbehan
2010/09/21 17:48:18
No trailing \ here needed.
|
all: |
- rm -rf $(TPM_WORK_DIR) |
- cp -a $(TPM_SRC_DIR) $(TPM_WORK_DIR) |
- $(MAKE) -C $(TPM_WORK_DIR)/nvtool clean |
- $(MAKE) -C $(TPM_WORK_DIR)/nvtool |
- rm -rf $(TLCL_WORK_DIR) |
- cp -a $(TLCL_SRC_DIR) $(TLCL_WORK_DIR) |
- $(MAKE) -C $(TLCL_WORK_DIR)/src clean |
- $(MAKE) cross USE_TPM_EMULATOR=0 -C $(TLCL_WORK_DIR)/src |
- # gets rid of host binary which confuses ARM build |
- rm $(TLCL_WORK_DIR)/src/tlcl/generator |
- cp $(TPM_WORK_DIR)/nvtool/tpm-nvtool $(BINDIR) |
- set -e; for i in $(PROGRAMS); \ |
- do cp $(TLCL_WORK_DIR)/src/testsuite/tpmtest_$$i $(BINDIR); done |
+ $(MAKE) -C $(VBOOT_DIR) clean |
+ $(MAKE) -C $(VBOOT_DIR) |
+ set -e; \ |
+ for i in $(PROGRAMS); do \ |
+ cp $(VBOOT_DIR)/build/tests/tpm_lite/tpmtest_$$i $(BINDIR); \ |
+ done |