diff options
author | Tom Hughes <tomhughes@chromium.org> | 2022-09-21 14:10:01 -0700 |
---|---|---|
committer | Tom Hughes <tomhughes@chromium.org> | 2022-09-22 12:49:33 -0700 |
commit | 2bcf863b492fe7ed8105c853814dba6ed32ba719 (patch) | |
tree | fcf6ce5810f9ff9e3c8cce434812dd75492269ed /util/compare_build.sh | |
parent | e5fb0b9ba488614b5684e640530f00821ab7b943 (diff) | |
parent | 28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff) | |
download | chrome-ec-2bcf863b492fe7ed8105c853814dba6ed32ba719.tar.gz |
Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-releasefirmware-fpmcu-bloonchipper-release
Generated by: ./util/update_release_branch.py --board bloonchipper
--relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-
fpmcu-bloonchipper-release
Relevant changes:
git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dc3e9008b8 board/hatch_fp/board.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header
BRANCH=None
BUG=b:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
Test "aes": PASSED
Test "cec": PASSED
Test "cortexm_fpu": PASSED
Test "crc": PASSED
Test "flash_physical": PASSED
Test "flash_write_protect": PASSED
Test "fpsensor_hw": PASSED
Test "fpsensor_spi_ro": PASSED
Test "fpsensor_spi_rw": PASSED
Test "fpsensor_uart_ro": PASSED
Test "fpsensor_uart_rw": PASSED
Test "mpu_ro": PASSED
Test "mpu_rw": PASSED
Test "mutex": PASSED
Test "pingpong": PASSED
Test "printf": PASSED
Test "queue": PASSED
Test "rollback_region0": PASSED
Test "rollback_region1": PASSED
Test "rollback_entropy": PASSED
Test "rtc": PASSED
Test "sha256": PASSED
Test "sha256_unrolled": PASSED
Test "static_if": PASSED
Test "stdlib": PASSED
Test "system_is_locked_wp_on": PASSED
Test "system_is_locked_wp_off": PASSED
Test "timer_dos": PASSED
Test "utils": PASSED
Test "utils_str": PASSED
Test "stm32f_rtc": PASSED
Test "panic_data_bloonchipper_v2.0.4277": PASSED
Test "panic_data_bloonchipper_v2.0.5938": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3
Diffstat (limited to 'util/compare_build.sh')
-rwxr-xr-x | util/compare_build.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/util/compare_build.sh b/util/compare_build.sh index 1b6030453a..e70dcdbed2 100755 --- a/util/compare_build.sh +++ b/util/compare_build.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -14,6 +14,7 @@ # * all - All boards that are built by the "buildall" target # * fp - All relevant boards for fingerprint # * stm32 - All boards that use an STM32 chip +# * stm32f0 - All boards that use an STM32F0 family of chip # * stm32f4 - All boards that use an STM32F4 family of chip # * stm32h7 - All boards that use an STM32H7 family of chip # * npcx - " @@ -50,7 +51,7 @@ DEFINE_string 'ref2' "HEAD^" 'Git reference (commit, branch, etc)' DEFINE_boolean 'keep' "${FLAGS_FALSE}" \ 'Remove the temp directory after comparison.' 'k' # Integer type can still be passed blank ("") -DEFINE_integer 'jobs' "-1" 'Number of jobs to pass to make' 'j' +DEFINE_integer 'jobs' "$(nproc)" 'Number of jobs to pass to make' 'j' # When compiling both refs for all boards, mem usage was larger than 32GB. # If you don't have more than 32GB, you probably don't want to build both # refs at the same time. Use the -o flag. @@ -61,6 +62,9 @@ DEFINE_boolean 'private' "${FLAGS_PRIVATE_DEFAULT}" \ # Usage: assoc-add-keys <associate_array_name> [item1 [item2...]] assoc-add-keys() { + # Shellcheck doesn't seem to support nameref variables yet. + # See https://github.com/koalaman/shellcheck/issues/1544. + # shellcheck disable=SC2034,SC2178 local -n arr="${1}" shift @@ -71,6 +75,9 @@ assoc-add-keys() { # Usage: assoc-rm-keys <associate_array_name> [item1 [item2...] assoc-rm-keys() { + # Shellcheck doesn't seem to support nameref variables yet. + # See https://github.com/koalaman/shellcheck/issues/1544. + # shellcheck disable=SC2034,SC2178 local -n arr="${1}" shift @@ -102,6 +109,8 @@ boards-with() { # Usage: parse-boards <associate_array_name> [board-grp1 [board-grp2...]] parse-boards() { + # Shellcheck doesn't seem to support nameref variables yet. + # See https://github.com/koalaman/shellcheck/issues/1544. # shellcheck disable=SC2034 local -n boards="$1" shift @@ -116,6 +125,7 @@ parse-boards() { [all]="$(make-print-boards)" [fp]="dartmonkey bloonchipper nucleo-dartmonkey nucleo-h743zi" [stm32]="$(boards-with 'CHIP[[:space:]:=]*stm32')" + [stm32f0]="$(boards-with 'CHIP_VARIANT[[:space:]:=]*stm32f0')" [stm32f4]="$(boards-with 'CHIP_VARIANT[[:space:]:=]*stm32f4')" [stm32h7]="$(boards-with 'CHIP_VARIANT[[:space:]:=]*stm32h7')" [npcx]="$(boards-with 'CHIP[[:space:]:=]*npcx')" @@ -216,6 +226,7 @@ echo "# Preparing Makefile" cat > "${TMP_DIR}/Makefile" <<HEREDOC ORIGIN ?= $(realpath .) CRYPTOC_DIR ?= $(realpath ../../third_party/cryptoc) +ZEPHYR_BASE ?= $(realpath ../../../src/third_party/zephyr/main) BOARDS ?= ${BOARDS[*]} LINKS ?= ${LINKS[*]} @@ -233,6 +244,7 @@ build-%: ec-% \$(MAKE) --no-print-directory -C \$(@:build-%=ec-%) \\ STATIC_VERSION=1 \\ CRYPTOC_DIR=\$(CRYPTOC_DIR) \\ + ZEPHYR_BASE=\$(ZEPHYR_BASE) \\ \$(addprefix proj-,\$(BOARDS)) @printf " MKDIR %s\n" "\$@" @mkdir -p \$@ |