diff options
| author | Craig Hesling <hesling@chromium.org> | 2020-12-15 19:07:50 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-24 06:24:51 +0000 |
| commit | 93b67dcad05356b132a63be4a9831932486594db (patch) | |
| tree | 5fbf7b64b1944799e8d75b4a83f6f1e89c376b06 /common/build.mk | |
| parent | 461f56040ea8fa2d2d3f2f7a5842601c296b5d4f (diff) | |
| download | chrome-ec-93b67dcad05356b132a63be4a9831932486594db.tar.gz | |
make: Move libcryptoc rules to third_party/rules.mk
This moves the libcryptoc hooks from common/build.mk to
third_party/rules.mk.
Recall that Makefile.rules actually contains all of the
"rules"/recipes for making objects. It alone contains
all of the build output beautification commands and control.
Makefile.rules is included as the last step in the master
Makefile.
This brings no firmware change, as verified with compare_build.sh.
BRANCH=none
BUG=none
TEST=./util/compare_build.sh -b fp
TEST=./util/compare_build.sh -b fp -p
# This fails due to the differing position of
# -lcryptoc, -lfpsensor, -lfpalgorithm, and/or -lfpbep.
Signed-off-by: Craig Hesling <hesling@chromium.org>
Change-Id: I8d8493536a0e56ac6a5a1a32827b99ae97723727
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2092163
Reviewed-by: Yicheng Li <yichengli@chromium.org>
Diffstat (limited to 'common/build.mk')
| -rw-r--r-- | common/build.mk | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/common/build.mk b/common/build.mk index cb6ac4832a..9b20fc1369 100644 --- a/common/build.mk +++ b/common/build.mk @@ -296,35 +296,6 @@ $(out)/rma_key_from_blob.h: board/$(BOARD)/$(BLOB_FILE) util/bin2h.sh endif -# Build and link against libcryptoc. -ifeq ($(CONFIG_LIBCRYPTOC),y) -CRYPTOCLIB := $(realpath ../../third_party/cryptoc) -ifneq ($(BOARD),host) -CPPFLAGS += -I$(abspath ./builtin) -endif -CPPFLAGS += -I$(CRYPTOCLIB)/include -CRYPTOC_LDFLAGS := -L$(out)/cryptoc -lcryptoc - -# Force the external build each time, so it can look for changed sources. -.PHONY: $(out)/cryptoc/libcryptoc.a -$(out)/cryptoc/libcryptoc.a: - +$(call quiet,libcryptoc,MAKE ) - -# Link RO and RW against cryptoc. -$(out)/RO/ec.RO.elf $(out)/RO/ec.RO_B.elf: LDFLAGS_EXTRA += $(CRYPTOC_LDFLAGS) -$(out)/RO/ec.RO.elf $(out)/RO/ec.RO_B.elf: $(out)/cryptoc/libcryptoc.a -$(out)/RW/ec.RW.elf $(out)/RW/ec.RW_B.elf: LDFLAGS_EXTRA += $(CRYPTOC_LDFLAGS) -$(out)/RW/ec.RW.elf $(out)/RW/ec.RW_B.elf: $(out)/cryptoc/libcryptoc.a -# Host test executables (including fuzz tests). -$(out)/$(PROJECT).exe: LDFLAGS_EXTRA += $(CRYPTOC_LDFLAGS) -$(out)/$(PROJECT).exe: $(out)/cryptoc/libcryptoc.a -# On-device tests. -test-targets=$(foreach test,$(test-list-y),\ - $(out)/RW/$(test).RW.elf $(out)/RO/$(test).RO.elf) -$(test-targets): LDFLAGS_EXTRA += $(CRYPTOC_LDFLAGS) -$(test-targets): $(out)/cryptoc/libcryptoc.a -endif - include $(_common_dir)fpsensor/build.mk include $(_common_dir)usbc/build.mk |