summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorCraig Hesling <hesling@chromium.org>2020-12-15 19:07:50 -0800
committerCommit Bot <commit-bot@chromium.org>2020-12-24 06:24:51 +0000
commit93b67dcad05356b132a63be4a9831932486594db (patch)
tree5fbf7b64b1944799e8d75b4a83f6f1e89c376b06 /Makefile.rules
parent461f56040ea8fa2d2d3f2f7a5842601c296b5d4f (diff)
downloadchrome-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 'Makefile.rules')
-rw-r--r--Makefile.rules8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.rules b/Makefile.rules
index f2a82a8bf1..e5cdb0f773 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -145,11 +145,6 @@ cmd_emmc_bootblock = $(out)/util/gen_emmc_transfer_data \
cmd_ipi_table = $(out)/util/gen_ipi_table $@
cmd_cp_script = cp "$<" "$@" && chmod +x "$@"
-cmd_libcryptoc_make = $(MAKE) -C $(CRYPTOCLIB) \
- obj=$(realpath $(out))/cryptoc \
- SUPPORT_UNALIGNED=1
-cmd_libcryptoc = $(cmd_libcryptoc_make) -q || $(cmd_libcryptoc_make)
-
# commands for RSA signature: rwsig does not need to sign the whole image
# (it signs the RW part separately). usbpd1 type needs to sign the final image.
ifeq ($(CONFIG_RWSIG_TYPE_RWSIG),)
@@ -876,6 +871,9 @@ build_cros_ec_commands: $(out_cros_ec_commands)
$(out_cros_ec_commands): include/ec_commands.h util/make_linux_ec_commands_h.sh
util/make_linux_ec_commands_h.sh $< $@
+# Pull in special rules/targets for third_party software
+-include third_party/rules.mk
+
.SECONDARY:
-include $(deps)