firmware/Makefile - Issue 6883040: Add option to use mocked TPM driver

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: firmware/Makefile

Issue 6883040: Add option to use mocked TPM driver (Closed) Base URL: ssh://gitrw.chromium.org:9222/vboot_reference.git@master

Patch Set: Code review Created 9 years, 8 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:

Index: firmware/Makefile

diff --git a/firmware/Makefile b/firmware/Makefile

index accc835c68c2de054f54c77265ff12d1646e2883..d9a305b41a3f860772fcdfe30b646f8b130858e8 100644

--- a/firmware/Makefile

+++ b/firmware/Makefile

@@ -57,16 +57,25 @@ LIB_SRCS = \

./lib/cryptolib/sha1.c \

./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 \

./lib/vboot_common.c \

./lib/vboot_firmware.c \

./lib/vboot_kernel.c \

./lib/vboot_nvstorage.c

+ifeq ($(MOCK_TPM),)

+LIB_SRCS += \

+ ./lib/rollback_index.c \

+ ./lib/tpm_bootmode.c \

+ ./lib/tpm_lite/tlcl.c

+else

+LIB_SRCS += \

+ ./lib/mocked_rollback_index.c \

+ ./lib/mocked_tpm_bootmode.c \

+ ./lib/tpm_lite/mocked_tlcl.c

+endif

LIB_OBJS = $(LIB_SRCS:%.c=${BUILD_ROOT}/%.o)

STUB_SRCS = \