diff options
author | Craig Hesling <hesling@chromium.org> | 2020-02-06 20:22:16 -0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-02-12 22:14:15 +0000 |
commit | 4acc29890130946ad574ea0f314b65497efb7ce2 (patch) | |
tree | 00b441201c0ea4812c0ec0db3822cc4ec12892e0 /Makefile.rules | |
parent | 67495bf67accdc4851bd18d542e6800fce140eac (diff) | |
download | chrome-ec-4acc29890130946ad574ea0f314b65497efb7ce2.tar.gz |
libcryptoc: Cleanup build messages
This patch cleans up all of the nonformatted make output generated
from calling out to libcryptoc's make script.
This makes no functional change.
# WITHOUT this fix, we see the following when libcryptoc.a is dirty:
> VERSION ec_version.h
> make obj=/mnt/host/source/src/platform/ec/build/hatch_fp/cryptoc SUPPORT_UNALIGNED=1 \
> CONFIG_UPTO_SHA512= -C /mnt/host/source/src/third_party/cryptoc
> MKDIR /mnt/host/source/src/platform/ec/build/hatch_fp/cryptoc
> CC util.c
# WITHOUT this fix, we see the following when libcryptoc.a is clean:
> CC RW/common/version.o
> make obj=/mnt/host/source/src/platform/ec/build/hatch_fp/cryptoc SUPPORT_UNALIGNED=1 \
> CONFIG_UPTO_SHA512= -C /mnt/host/source/src/third_party/cryptoc
> make[2]: '/mnt/host/source/src/platform/ec/build/hatch_fp/cryptoc/libcryptoc.a' is up to date.
> LD RW/ec.RW.elf
# WITH this fix, we see the following when libcryptoc.a is dirty:
> MAKE cryptoc/libcryptoc.a
> MKDIR /mnt/host/source/src/platform/ec/build/hatch_fp/cryptoc
> CC util.c
> ...
> AR libcryptoc.a
# WITH this fix, we see the following when libcryptoc.a is clean:
> CC RW/common/version.o
> MAKE cryptoc/libcryptoc.a
> LD RW/ec.RW.elf
This also fixes the following error:
warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
BRANCH=none
BUG=none
TEST=rm -rf build/
make proj-cr50 proj-nocturne_fp proj-hatch_fp
# We should see a "MAKE cryptoc/libcryptoc.a" followed by the
# MKDIR, CC, and AR lines for each libcryptoc object.
# No spurious make output relacted to libcryptoc should be generated.
make proj-cr50 proj-nocturne_fp proj-hatch_fp
# We should see a "MAKE ... libcryptoc" followed by no
# additional libcrypto specific make steps.
# Unfortunately, with libcryptoc being a PHONY target, we can't avoid
# rebuilding other downstream objects. This should be fixed.
touch ../../third_party/cryptoc/*.c
make proj-cr50 proj-nocturne_fp proj-hatch_fp
# We should see a "MAKE cryptoc/libcryptoc.a" followed by the
# CC and AR lines for each libcryptoc object.
# No spurious make output relacted to libcryptoc should be generated.
# We should see a "MAKE ... libcryptoc" followed by no
# additional libcrypto specific make steps
TEST=rm -rf build/
make BOARD=hatch_fp V=1 build/hatch_fp/cryptoc/libcryptoc.a
# Ensure that verbose mode is passed to sub-make
TEST=rm -rf build/
make BOARD=hatch_fp build/hatch_fp/cryptoc/libcryptoc.a
# Ensure that verbose is disabled
TEST=make proj-grunt
# No mention of libcryptoc
Change-Id: I8afde8b5981861647b3eee0044fd3fd3e8fafaec
Signed-off-by: Craig Hesling <hesling@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2042784
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'Makefile.rules')
-rw-r--r-- | Makefile.rules | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules index a8357a5b93..44897ebc24 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -139,6 +139,12 @@ 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) --no-print-directory -C $(CRYPTOCLIB) \ + obj=$(realpath $(out))/cryptoc \ + SUPPORT_UNALIGNED=1 \ + CONFIG_UPTO_SHA512=$(CONFIG_UPTO_SHA512) +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),) |