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

Unified Diff: firmware/Makefile

Issue 2919010: Add tpm lite to vboot reference (Closed) Base URL: ssh://gitrw.chromium.org/vboot_reference.git
Patch Set: Created 10 years, 5 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 | « Makefile ('k') | firmware/include/sysincludes.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 38eb24f87d1c16a5a9f5c756fe7dac92c4971a9c..67ed1565bca14d22d259a5889e649246d68cd8af 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -7,15 +7,20 @@ 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.
+CFLAGS += -DDISABLE_ROLLBACK_TPM
INCLUDES = \
-I$(FWTOP)/include \
-I$(LIBDIR)/include \
-I$(LIBDIR)/cgptlib/include \
-I$(LIBDIR)/cryptolib/include \
+ -I$(LIBDIR)/tpm_lite/include \
-I$(STUBDIR)/include
-
# find ./lib -iname '*.c' | sort
LIB_SRCS = \
./lib/cgptlib/cgptlib.c \
@@ -29,6 +34,7 @@ LIB_SRCS = \
./lib/cryptolib/sha_utility.c \
./lib/rollback_index.c \
./lib/stateful_util.c \
+ ./lib/tpm_lite/tlcl.c \
./lib/vboot_common.c \
./lib/vboot_firmware.c \
./lib/vboot_kernel.c
@@ -36,14 +42,14 @@ LIB_SRCS = \
STUB_SRCS = \
./stub/boot_device_stub.c \
./stub/load_firmware_stub.c \
- ./stub/tlcl.c \
+ ./stub/tpm_lite_stub.c \
./stub/utility_stub.c
ALL_SRCS = ${LIB_SRCS} ${STUB_SRCS} version.c
test : $(FWLIB) update-version
$(CC) $(CFLAGS) $(INCLUDES) -o $(BUILD_ROOT)/a.out \
- $(TESTDIR)/main.c $(FWLIB)
+ $(TESTDIR)/main.c $(LIBS)
# This is executed at every make, to see if anything has changed
update-version :
« no previous file with comments | « Makefile ('k') | firmware/include/sysincludes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698