scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-27 18:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cr50: Build external libs remotely, but put objects here

Browse Source 
When building components from external libraries, instead of
rsyncing the library into our build directory and building there,
just build in the library directory and have it put its generated
objects into our build tree. That will keep any build artifacts
in the library directory from polluting our builds unexpectedly.

BUG=chrome-os-partner:43025
BRANCH=none
TEST=make buildall

Change-Id: I2f07a2b49d1a0ba9fd9fff0822551486be820b70
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/295044
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
This commit is contained in:
Bill Richardson
2015-08-20 14:32:14 -07:00
committed by ChromeOS Commit Bot
parent 0bb856d9e8
commit 65d683a7e5
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
board/cr50/build.mk
View File

@@ -10,20 +10,30 @@ CHIP_FAMILY:=cr50
CHIP_VARIANT ?= cr50_fpga
board-y=board.o
LDFLAGS_EXTRA += -L$(out)/tpm2/build -ltpm2
# Need to generate a .hex file
all: hex
ifeq ($(BOARD_MK_INCLUDED),)
BOARD_MK_INCLUDED=1
# This file is included twice by the Makefile, once to determine the CHIP info
# and then again after defining all the CONFIG_ and HAS_TASK variables. We use
# a guard so that recipe definitions and variable extensions only happen the
# second time.
ifeq ($(BOARD_MK_INCLUDED_ONCE),)
BOARD_MK_INCLUDED_ONCE=1
else
$(out)/RO/ec.RO.elf: $(out)/tpm2/build/libtpm2.a
$(out)/RW/ec.RW.elf: $(out)/tpm2/build/libtpm2.a
# Build and link with an external library
EXTLIB := $(realpath ../../third_party/tpm2)
.PHONY: $(out)/tpm2/build/libtpm2.a
$(out)/tpm2/build/libtpm2.a:
rsync -a ../../third_party/tpm2 $(out)
$(MAKE) ROOTDIR=$(realpath board/$(BOARD)/tpm2) EMBEDDED_MODE=1 \
-C $(out)/tpm2
endif
CFLAGS += -I$(EXTLIB) -I$(realpath $(BDIR)/tpm2)
LDFLAGS_EXTRA += -L$(out)/tpm2 -ltpm2
$(out)/RO/ec.RO.elf: $(out)/tpm2/libtpm2.a
$(out)/RW/ec.RW.elf: $(out)/tpm2/libtpm2.a
# Force the external build each time, so it can look for changed sources.
.PHONY: $(out)/tpm2/libtpm2.a
$(out)/tpm2/libtpm2.a:
$(MAKE) obj=$(realpath $(out))/tpm2 EMBEDDED_MODE=1 -C $(EXTLIB)
endif # BOARD_MK_INCLUDED_ONCE is nonempty

6
common/tpm_registers.c
View File

@@ -17,9 +17,9 @@
#include "util.h"
/* TPM2 library includes. */
#include "tpm2/ExecCommand_fp.h"
#include "tpm2/Platform.h"
#include "tpm2/_TPM_Init_fp.h"
#include "ExecCommand_fp.h"
#include "Platform.h"
#include "_TPM_Init_fp.h"
#define CPRINTS(format, args...) cprints(CC_TPM, format, ## args)
#define CPRINTF(format, args...) cprintf(CC_TPM, format, ## args)